From 5efa986ac1508441f1c5216e4960aac4d0dd34c5 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 18 Nov 2016 01:32:03 +0100 Subject: [PATCH] Fix compilation warnings --- include/Nazara/Core/Bitset.inl | 2 +- tests/Engine/Core/Bitset.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/Nazara/Core/Bitset.inl b/include/Nazara/Core/Bitset.inl index c0fdb1655..aedb18fd7 100644 --- a/include/Nazara/Core/Bitset.inl +++ b/include/Nazara/Core/Bitset.inl @@ -172,7 +172,7 @@ namespace Nz for (std::size_t block = 0; block < blockCount - 1; ++block) { m_blocks.push_back(static_cast(bits)); - bits >>= BitCount(); + bits = (BitCount() < BitCount()) ? bits >> BitCount() : 0U; bitCount -= BitCount(); } diff --git a/tests/Engine/Core/Bitset.cpp b/tests/Engine/Core/Bitset.cpp index 2cefd69df..b06a38aa8 100644 --- a/tests/Engine/Core/Bitset.cpp +++ b/tests/Engine/Core/Bitset.cpp @@ -44,7 +44,7 @@ void CheckAppend(const char* title) #define BitVal1 00110111 #define BitVal2 11011110 #define BitVal3 01000010 - std::array data = {NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}; + std::array data = {{NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}}; const char result[] = NazaraStringifyMacro(BitVal3) NazaraStringifyMacro(BitVal2) NazaraStringifyMacro(BitVal1); std::size_t resultLength = Nz::CountOf(result) - 1; std::size_t bitCount = data.size() * 8; @@ -232,7 +232,7 @@ void CheckRead(const char* title) #define BitVal1 10010101 #define BitVal2 11010010 #define BitVal3 01101010 - std::array data = {NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}; + std::array data = {{NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}}; const char result[] = NazaraStringifyMacro(BitVal3) NazaraStringifyMacro(BitVal2) NazaraStringifyMacro(BitVal1); std::size_t resultLength = Nz::CountOf(result) - 1; std::size_t bitCount = data.size() * 8;