diff --git a/Source/Core/Common/BitSet.h b/Source/Core/Common/BitSet.h index 5d2c88294d..cc658a19f7 100644 --- a/Source/Core/Common/BitSet.h +++ b/Source/Core/Common/BitSet.h @@ -98,15 +98,15 @@ public: constexpr BitSet(std::initializer_list init) { for (int bit : init) - m_val |= (IntTy)1 << bit; + m_val |= IntTy{1} << bit; } constexpr static BitSet AllTrue(size_t count) { - return BitSet(count == sizeof(IntTy) * 8 ? ~(IntTy)0 : (((IntTy)1 << count) - 1)); + return BitSet(count == sizeof(IntTy) * 8 ? ~IntTy{0} : ((IntTy{1} << count) - 1)); } - Ref operator[](size_t bit) { return Ref(this, (IntTy)1 << bit); } + Ref operator[](size_t bit) { return Ref(this, IntTy{1} << bit); } constexpr const Ref operator[](size_t bit) const { return (*const_cast(this))[bit]; } constexpr bool operator==(BitSet other) const { return m_val == other.m_val; } constexpr bool operator!=(BitSet other) const { return m_val != other.m_val; }