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

Core/Bitset: Minor changes 

Former-commit-id: 0d4e2007c83f34ca966615b55927cf34e88670af
This commit is contained in:
Lynix 2015-09-18 20:00:53 +02:00
parent 294894e8c1
commit 2c752a38c3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,7 @@ template<typename Block, class Allocator>
void NzBitset<Block, Allocator>::Resize(unsigned int bitCount, bool defaultVal) void NzBitset<Block, Allocator>::Resize(unsigned int bitCount, bool defaultVal)
{ {
// On commence par changer la taille du conteneur, avec la valeur correcte d'initialisation // On commence par changer la taille du conteneur, avec la valeur correcte d'initialisation
unsigned int lastBlockIndex = m_blocks.size()-1; unsigned int lastBlockIndex = m_blocks.size() - 1;
m_blocks.resize(ComputeBlockCount(bitCount), (defaultVal) ? fullBitMask : 0U); m_blocks.resize(ComputeBlockCount(bitCount), (defaultVal) ? fullBitMask : 0U);
unsigned int remainingBits = GetBitIndex(m_bitCount); unsigned int remainingBits = GetBitIndex(m_bitCount);
@ -358,7 +358,7 @@ T NzBitset<Block, Allocator>::To() const
{ {
static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "T must be a unsigned integral type"); static_assert(std::is_integral<T>() && std::is_unsigned<T>(), "T must be a unsigned integral type");
NazaraAssert(m_bitCount <= std::numeric_limits<T>::digits, "Bit count cannot be greater than UInt32 bit count"); NazaraAssert(m_bitCount <= std::numeric_limits<T>::digits, "Bit count cannot be greater than T bit count");
T value = 0; T value = 0;
for (unsigned int i = 0; i < m_blocks.size(); ++i) for (unsigned int i = 0; i < m_blocks.size(); ++i)