diff options
Diffstat (limited to '')
-rw-r--r-- | src/common/alignment.h | 8 | ||||
-rw-r--r-- | src/common/lz4_compression.cpp | 2 | ||||
-rw-r--r-- | src/common/lz4_compression.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/common/alignment.h b/src/common/alignment.h index 0057052af..fc5c26898 100644 --- a/src/common/alignment.h +++ b/src/common/alignment.h @@ -12,7 +12,9 @@ namespace Common { template <typename T> requires std::is_integral_v<T> -[[nodiscard]] constexpr T AlignUp(T value, size_t size) { +[[nodiscard]] constexpr T AlignUp(T value_, size_t size) { + using U = typename std::make_unsigned_t<T>; + auto value{static_cast<U>(value_)}; auto mod{static_cast<T>(value % size)}; value -= mod; return static_cast<T>(mod == T{0} ? value : value + size); @@ -26,7 +28,9 @@ template <typename T> template <typename T> requires std::is_integral_v<T> -[[nodiscard]] constexpr T AlignDown(T value, size_t size) { +[[nodiscard]] constexpr T AlignDown(T value_, size_t size) { + using U = typename std::make_unsigned_t<T>; + const auto value{static_cast<U>(value_)}; return static_cast<T>(value - value % size); } diff --git a/src/common/lz4_compression.cpp b/src/common/lz4_compression.cpp index 6867c03c4..d85ab1742 100644 --- a/src/common/lz4_compression.cpp +++ b/src/common/lz4_compression.cpp @@ -71,7 +71,7 @@ std::vector<u8> DecompressDataLZ4(std::span<const u8> compressed, std::size_t un return uncompressed; } -int DecompressLZ4(void* dst, size_t dst_size, const void* src, size_t src_size) { +int DecompressDataLZ4(void* dst, size_t dst_size, const void* src, size_t src_size) { // This is just a thin wrapper around LZ4. return LZ4_decompress_safe(reinterpret_cast<const char*>(src), reinterpret_cast<char*>(dst), static_cast<int>(src_size), static_cast<int>(dst_size)); diff --git a/src/common/lz4_compression.h b/src/common/lz4_compression.h index 7200e0f22..3ae17c2bb 100644 --- a/src/common/lz4_compression.h +++ b/src/common/lz4_compression.h @@ -56,6 +56,6 @@ namespace Common::Compression { [[nodiscard]] std::vector<u8> DecompressDataLZ4(std::span<const u8> compressed, std::size_t uncompressed_size); -int DecompressLZ4(void* dst, size_t dst_size, const void* src, size_t src_size); +[[nodiscard]] int DecompressDataLZ4(void* dst, size_t dst_size, const void* src, size_t src_size); } // namespace Common::Compression |