sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation warnings

This commit is contained in:
Lynix 2016-11-18 01:32:03 +01:00
parent ac05e022f8
commit 5efa986ac1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/Bitset.inl
View File

@ -172,7 +172,7 @@ namespace Nz
for (std::size_t block = 0; block < blockCount - 1; ++block) for (std::size_t block = 0; block < blockCount - 1; ++block)
{ {
m_blocks.push_back(static_cast<Block>(bits)); m_blocks.push_back(static_cast<Block>(bits));
bits >>= BitCount<Block>(); bits = (BitCount<Block>() < BitCount<T>()) ? bits >> BitCount<Block>() : 0U;
bitCount -= BitCount<Block>(); bitCount -= BitCount<Block>();
} }

4
tests/Engine/Core/Bitset.cpp
View File

@ -44,7 +44,7 @@ void CheckAppend(const char* title)
#define BitVal1 00110111 #define BitVal1 00110111
#define BitVal2 11011110 #define BitVal2 11011110
#define BitVal3 01000010 #define BitVal3 01000010
std::array<Nz::UInt8, 3> data = {NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}; std::array<Nz::UInt8, 3> data = {{NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}};
const char result[] = NazaraStringifyMacro(BitVal3) NazaraStringifyMacro(BitVal2) NazaraStringifyMacro(BitVal1); const char result[] = NazaraStringifyMacro(BitVal3) NazaraStringifyMacro(BitVal2) NazaraStringifyMacro(BitVal1);
std::size_t resultLength = Nz::CountOf(result) - 1; std::size_t resultLength = Nz::CountOf(result) - 1;
std::size_t bitCount = data.size() * 8; std::size_t bitCount = data.size() * 8;
@ -232,7 +232,7 @@ void CheckRead(const char* title)
#define BitVal1 10010101 #define BitVal1 10010101
#define BitVal2 11010010 #define BitVal2 11010010
#define BitVal3 01101010 #define BitVal3 01101010
std::array<Nz::UInt8, 3> data = {NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}; std::array<Nz::UInt8, 3> data = {{NazaraPrefixMacro(BitVal1, 0b), NazaraPrefixMacro(BitVal2, 0b), NazaraPrefixMacro(BitVal3, 0b)}};
const char result[] = NazaraStringifyMacro(BitVal3) NazaraStringifyMacro(BitVal2) NazaraStringifyMacro(BitVal1); const char result[] = NazaraStringifyMacro(BitVal3) NazaraStringifyMacro(BitVal2) NazaraStringifyMacro(BitVal1);
std::size_t resultLength = Nz::CountOf(result) - 1; std::size_t resultLength = Nz::CountOf(result) - 1;
std::size_t bitCount = data.size() * 8; std::size_t bitCount = data.size() * 8;