diff options
| author | LC <mathew1800@gmail.com> | 2021-01-09 22:45:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-09 22:45:29 +0100 |
| commit | 0f932d30f5e3ef73bb18727801bf43628cbb4ac8 (patch) | |
| tree | ea6d9977dad2abab7fa1b063260f3b1864a23b21 | |
| parent | Merge pull request #5322 from Morph1984/resolve-c4062-msvc (diff) | |
| parent | common/div_ceil: Return numerator type (diff) | |
| download | yuzu-0f932d30f5e3ef73bb18727801bf43628cbb4ac8.tar yuzu-0f932d30f5e3ef73bb18727801bf43628cbb4ac8.tar.gz yuzu-0f932d30f5e3ef73bb18727801bf43628cbb4ac8.tar.bz2 yuzu-0f932d30f5e3ef73bb18727801bf43628cbb4ac8.tar.lz yuzu-0f932d30f5e3ef73bb18727801bf43628cbb4ac8.tar.xz yuzu-0f932d30f5e3ef73bb18727801bf43628cbb4ac8.tar.zst yuzu-0f932d30f5e3ef73bb18727801bf43628cbb4ac8.zip | |
| -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 6b2c48f91..95e1489a9 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 |