Merge pull request USCiLab#355 from drivehappy/develop

Fix bitset loading when bits are already set.
headupinclouds · Oct 28, 2016 · 195c0bf · 195c0bf
2 parents d27cc33 + 34bb0d9
commit 195c0bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/include/cereal/types/bitset.hpp b/include/cereal/types/bitset.hpp
@@ -148,6 +148,8 @@ namespace cereal
         std::uint8_t chunk = 0;
         std::uint8_t mask  = 0;
 
+        bits.reset();
+
         // Load one chunk at a time, rotating through the chunk
         // to set bits in the bitset
         for( std::size_t i = 0; i < N; ++i )

diff --git a/unittests/bitset.cpp b/unittests/bitset.cpp
@@ -44,6 +44,7 @@ void test_bitset()
     std::bitset<65> o_bit65( rng65() );
     std::bitset<256> o_bit256( rng256() );
     std::bitset<512> o_bit512( rng512() );
+    std::bitset<32>  o_bit32_low( 0 );
 
     std::ostringstream os;
     {
@@ -53,12 +54,14 @@ void test_bitset()
       oar(o_bit65);
       oar(o_bit256);
       oar(o_bit512);
+      oar(o_bit32_low);
     }
 
     std::bitset<32>  i_bit32;
     std::bitset<65>  i_bit65;
     std::bitset<256> i_bit256;
     std::bitset<512> i_bit512;
+    std::bitset<32>  i_bit32_low( 0xffffffff );
 
     std::istringstream is(os.str());
     {
@@ -68,12 +71,15 @@ void test_bitset()
       iar(i_bit65);
       iar(i_bit256);
       iar(i_bit512);
+      iar(i_bit32_low);
     }
 
     BOOST_CHECK_EQUAL( o_bit32, i_bit32 );
     BOOST_CHECK_EQUAL( o_bit65, i_bit65 );
     BOOST_CHECK_EQUAL( o_bit256, i_bit256 );
     BOOST_CHECK_EQUAL( o_bit512, i_bit512 );
+
+    BOOST_CHECK_EQUAL( o_bit32_low, i_bit32_low );
   }
 }