BitSet64: Fix iterator incrementation

Use 1 of the same type as the stored value when shifting left. This
prevents undefined behavior caused by shifting an int more than 31 bits.

Previously iterator incrementation could either hang or prematurely
report it had reached the end of the bitset.

1 files changed, 8 insertions, 0 deletions

diff --git a/Source/UnitTests/Common/BitSetTest.cpp b/Source/UnitTests/Common/BitSetTest.cpp
index 6ec2b74bdb..397f9fecbe 100644
--- a/Source/UnitTests/Common/BitSetTest.cpp
+++ b/Source/UnitTests/Common/BitSetTest.cpp
@@ -41,6 +41,10 @@ TEST(BitSet, Count)
   {
     const auto bitset = BitSet32(number);
     EXPECT_EQ(bitset.Count(), bitcount);
+    u32 iterating_count = 0;
+    for (auto iter = bitset.begin(); iter != bitset.end(); ++iter)
+      ++iterating_count;
+    EXPECT_EQ(iterating_count, bitcount);
   }
 
   constexpr std::array<std::pair<u64, u32>, 9> random_64bit_number_bitcount_pairs = {
@@ -57,6 +61,10 @@ TEST(BitSet, Count)
   {
     const auto bitset = BitSet64(number);
     EXPECT_EQ(bitset.Count(), bitcount);
+    u32 iterating_count = 0;
+    for (auto iter = bitset.begin(); iter != bitset.end(); ++iter)
+      ++iterating_count;
+    EXPECT_EQ(iterating_count, bitcount);
   }
 }