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

(Bitset) Consistency 

Former-commit-id: 4974483833cad392e105d2fc2dfc4d9f8d7310d3
This commit is contained in:
Lynix 2015-03-17 12:26:29 +01:00
parent 03ef0f9f50
commit 4c0c47240c
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/Nazara/Core/Bitset.hpp
View File

@ -95,6 +95,7 @@ class NzBitset
unsigned int FindFirstFrom(unsigned int blockIndex) const; unsigned int FindFirstFrom(unsigned int blockIndex) const;
Block GetLastBlockMask() const; Block GetLastBlockMask() const;
void ResetExtraBits(); void ResetExtraBits();
static unsigned int ComputeBlockCount(unsigned int bitCount); static unsigned int ComputeBlockCount(unsigned int bitCount);
static unsigned int GetBitIndex(unsigned int bit); static unsigned int GetBitIndex(unsigned int bit);
static unsigned int GetBlockIndex(unsigned int bit); static unsigned int GetBlockIndex(unsigned int bit);
@ -103,22 +104,22 @@ class NzBitset
unsigned int m_bitCount; unsigned int m_bitCount;
}; };
template<typename Block, typename Allocator> template<typename Block, class Allocator>
bool operator==(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs); bool operator==(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs);
template<typename Block, typename Allocator> template<typename Block, class Allocator>
bool operator!=(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs); bool operator!=(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs);
template<typename Block, typename Allocator> template<typename Block, class Allocator>
NzBitset<Block, Allocator> operator&(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs); NzBitset<Block, Allocator> operator&(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs);
template<typename Block, typename Allocator> template<typename Block, class Allocator>
NzBitset<Block, Allocator> operator|(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs); NzBitset<Block, Allocator> operator|(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs);
template<typename Block, typename Allocator> template<typename Block, class Allocator>
NzBitset<Block, Allocator> operator^(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs); NzBitset<Block, Allocator> operator^(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs);
template<typename Block, typename Allocator> template<typename Block, class Allocator>
class NzBitset<Block, Allocator>::Bit class NzBitset<Block, Allocator>::Bit
{ {
friend NzBitset<Block, Allocator>; friend NzBitset<Block, Allocator>;

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

@ -533,7 +533,7 @@ template<typename Block, class Allocator>
unsigned int NzBitset<Block, Allocator>::npos = std::numeric_limits<unsigned int>::max(); unsigned int NzBitset<Block, Allocator>::npos = std::numeric_limits<unsigned int>::max();
template<typename Block, typename Allocator> template<typename Block, class Allocator>
bool operator==(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs) bool operator==(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs)
{ {
// La comparaison part du principe que (uint8) 00001100 == (uint16) 00000000 00001100 // La comparaison part du principe que (uint8) 00001100 == (uint16) 00000000 00001100
@ -560,13 +560,13 @@ bool operator==(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, All
return true; return true;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
bool operator!=(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs) bool operator!=(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs)
{ {
return !(lhs == rhs); return !(lhs == rhs);
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
NzBitset<Block, Allocator> operator&(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs) NzBitset<Block, Allocator> operator&(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs)
{ {
NzBitset<Block, Allocator> bitset; NzBitset<Block, Allocator> bitset;
@ -575,7 +575,7 @@ NzBitset<Block, Allocator> operator&(const NzBitset<Block, Allocator>& lhs, cons
return bitset; return bitset;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
NzBitset<Block, Allocator> operator|(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs) NzBitset<Block, Allocator> operator|(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs)
{ {
NzBitset<Block, Allocator> bitset; NzBitset<Block, Allocator> bitset;
@ -584,7 +584,7 @@ NzBitset<Block, Allocator> operator|(const NzBitset<Block, Allocator>& lhs, cons
return bitset; return bitset;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
NzBitset<Block, Allocator> operator^(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs) NzBitset<Block, Allocator> operator^(const NzBitset<Block, Allocator>& lhs, const NzBitset<Block, Allocator>& rhs)
{ {
NzBitset<Block, Allocator> bitset; NzBitset<Block, Allocator> bitset;
@ -594,7 +594,7 @@ NzBitset<Block, Allocator> operator^(const NzBitset<Block, Allocator>& lhs, cons
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::Flip() typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::Flip()
{ {
m_block ^= m_mask; m_block ^= m_mask;
@ -602,13 +602,13 @@ typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::Flip(
return *this; return *this;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::Reset() typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::Reset()
{ {
return Set(false); return Set(false);
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::Set(bool val) typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::Set(bool val)
{ {
// https://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching // https://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching
@ -617,13 +617,13 @@ typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::Set(b
return *this; return *this;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
bool NzBitset<Block, Allocator>::Bit::Test() const bool NzBitset<Block, Allocator>::Bit::Test() const
{ {
return m_block & m_mask; return m_block & m_mask;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
template<bool BadCall> template<bool BadCall>
void* NzBitset<Block, Allocator>::Bit::operator&() const void* NzBitset<Block, Allocator>::Bit::operator&() const
{ {
@ -633,25 +633,25 @@ void* NzBitset<Block, Allocator>::Bit::operator&() const
return nullptr; return nullptr;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
NzBitset<Block, Allocator>::Bit::operator bool() const NzBitset<Block, Allocator>::Bit::operator bool() const
{ {
return Test(); return Test();
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator=(bool val) typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator=(bool val)
{ {
return Set(val); return Set(val);
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator=(const Bit& bit) typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator=(const Bit& bit)
{ {
return Set(bit); return Set(bit);
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator|=(bool val) typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator|=(bool val)
{ {
// Version sans branching: // Version sans branching:
@ -666,7 +666,7 @@ typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::opera
return *this; return *this;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator&=(bool val) typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator&=(bool val)
{ {
// Version sans branching: // Version sans branching:
@ -681,7 +681,7 @@ typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::opera
return *this; return *this;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator^=(bool val) typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator^=(bool val)
{ {
// Version sans branching: // Version sans branching:
@ -696,7 +696,7 @@ typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::opera
return *this; return *this;
} }
template<typename Block, typename Allocator> template<typename Block, class Allocator>
typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator-=(bool val) typename NzBitset<Block, Allocator>::Bit& NzBitset<Block, Allocator>::Bit::operator-=(bool val)
{ {
// Version sans branching: // Version sans branching: