Merge pull request #11491 from lioncash/set

Common/BitSet: Mark initializer_list constructor as constexpr
dolphin-emu · Jan 25, 2023 · 70b2a67 · 70b2a67
2 parents 6db2171 + 0d93a31
commit 70b2a67
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/Source/Core/Common/BitSet.h b/Source/Core/Common/BitSet.h
@@ -93,11 +93,10 @@ class BitSet
     int m_bit;
   };
 
-  constexpr BitSet() : m_val(0) {}
+  constexpr BitSet() = default;
   constexpr explicit BitSet(IntTy val) : m_val(val) {}
-  BitSet(std::initializer_list<int> init)
+  constexpr BitSet(std::initializer_list<int> init)
   {
-    m_val = 0;
     for (int bit : init)
       m_val |= (IntTy)1 << bit;
   }
@@ -132,7 +131,7 @@ class BitSet
   constexpr unsigned int Count() const { return std::popcount(m_val); }
   constexpr Iterator begin() const { return ++Iterator(m_val, 0); }
   constexpr Iterator end() const { return Iterator(m_val, -1); }
-  IntTy m_val;
+  IntTy m_val{};
 };
 }  // namespace Common