ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bitset: Make bool() operator explicit.

This commit is contained in:
Scott Mansell 2015-10-04 01:10:11 +13:00
parent 18142eddb4
commit 5f8a67250f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/BitSet.h
View File

@ -164,8 +164,7 @@ public:
BitSet& operator|=(BitSet other) { return *this = *this | other; } BitSet& operator|=(BitSet other) { return *this = *this | other; }
BitSet& operator&=(BitSet other) { return *this = *this & other; } BitSet& operator&=(BitSet other) { return *this = *this & other; }
BitSet& operator^=(BitSet other) { return *this = *this ^ other; } BitSet& operator^=(BitSet other) { return *this = *this ^ other; }
operator u32() const = delete; explicit operator bool() const { return m_val != 0; }
operator bool() const { return m_val != 0; }
// Warning: Even though on modern CPUs this is a single fast instruction, // Warning: Even though on modern CPUs this is a single fast instruction,
// Dolphin's official builds do not currently assume POPCNT support on x86, // Dolphin's official builds do not currently assume POPCNT support on x86,

2
Source/Core/Common/Logging/LogManager.h
View File

@ -75,7 +75,7 @@ public:
void SetLevel(LogTypes::LOG_LEVELS level) { m_level = level; } void SetLevel(LogTypes::LOG_LEVELS level) { m_level = level; }
bool HasListeners() const { return m_listener_ids; } bool HasListeners() const { return bool(m_listener_ids); }
typedef class BitSet32::Iterator iterator; typedef class BitSet32::Iterator iterator;
iterator begin() const { return m_listener_ids.begin(); } iterator begin() const { return m_listener_ids.begin(); }