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

Core/Bitset: Replace static members by static constexpr

Browse Source 
Former-commit-id: 0c2a2eb8d766f544016068cdc4be859be2b20dd5
This commit is contained in:
Lynix
2016-01-08 01:28:49 +01:00
parent b9ec4a4fc4
commit bbaa328530
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@
#include <Nazara/Prerequesites.hpp> #include <Nazara/Prerequesites.hpp>
#include <Nazara/Core/String.hpp> #include <Nazara/Core/String.hpp>
#include <limits>
#include <memory> #include <memory>
#include <type_traits> #include <type_traits>
@@ -89,9 +90,9 @@ namespace Nz
Bitset& operator|=(const Bitset& bitset); Bitset& operator|=(const Bitset& bitset);
Bitset& operator^=(const Bitset& bitset); Bitset& operator^=(const Bitset& bitset);
static Block fullBitMask; static constexpr Block fullBitMask = std::numeric_limits<Block>::max();
static unsigned int bitsPerBlock; static constexpr unsigned int bitsPerBlock = std::numeric_limits<Block>::digits;
static unsigned int npos; static constexpr unsigned int npos = std::numeric_limits<unsigned int>::max();
private: private:
unsigned int FindFirstFrom(unsigned int blockIndex) const; unsigned int FindFirstFrom(unsigned int blockIndex) const;

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

@@ -521,15 +521,6 @@ namespace Nz
return bit / bitsPerBlock; return bit / bitsPerBlock;
} }
template<typename Block, class Allocator>
Block Bitset<Block, Allocator>::fullBitMask = std::numeric_limits<Block>::max();
template<typename Block, class Allocator>
unsigned int Bitset<Block, Allocator>::bitsPerBlock = std::numeric_limits<Block>::digits;
template<typename Block, class Allocator>
unsigned int Bitset<Block, Allocator>::npos = std::numeric_limits<unsigned int>::max();
template<typename Block, class Allocator> template<typename Block, class Allocator>
typename Bitset<Block, Allocator>::Bit& Bitset<Block, Allocator>::Bit::Flip() typename Bitset<Block, Allocator>::Bit& Bitset<Block, Allocator>::Bit::Flip()