diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-01-09 03:14:18 -0300 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-01-09 03:16:10 -0300 |
| commit | 7e3b53c5bef6defa72fc4ab5e7731c442a37c7f3 (patch) | |
| tree | d662eb78fd10b4da3ef49657251afb37a686ad02 /src/common | |
| parent | fa0fc64dee336fdbb53b4cb1e9fb706e3dceae25 (diff) | |
common/div_ceil: Return numerator type
Fixes instances where DivCeil(u32, u64) would surprisingly return u64,
instead of the more natural u32.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/div_ceil.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/div_ceil.h b/src/common/div_ceil.h index 6b2c48f91e..95e1489a9c 100644 --- a/src/common/div_ceil.h +++ b/src/common/div_ceil.h @@ -11,16 +11,16 @@ namespace Common { /// Ceiled integer division. template <typename N, typename D> -requires std::is_integral_v<N>&& std::is_unsigned_v<D>[[nodiscard]] constexpr auto DivCeil( - N number, D divisor) { - return (static_cast<D>(number) + divisor - 1) / divisor; +requires std::is_integral_v<N>&& std::is_unsigned_v<D>[[nodiscard]] constexpr N DivCeil(N number, + D divisor) { + return static_cast<N>((static_cast<D>(number) + divisor - 1) / divisor); } /// Ceiled integer division with logarithmic divisor in base 2 template <typename N, typename D> -requires std::is_integral_v<N>&& std::is_unsigned_v<D>[[nodiscard]] constexpr auto DivCeilLog2( +requires std::is_integral_v<N>&& std::is_unsigned_v<D>[[nodiscard]] constexpr N DivCeilLog2( N value, D alignment_log2) { - return (static_cast<D>(value) + (D(1) << alignment_log2) - 1) >> alignment_log2; + return static_cast<N>((static_cast<D>(value) + (D(1) << alignment_log2) - 1) >> alignment_log2); } } // namespace Common |