Replace Block(~0) with a max_limit<Block>::value

include/boost/dynamic_bitset/detail/dynamic_bitset.hpp

@@ -30,6 +30,14 @@ namespace boost {
   namespace detail {
   namespace dynamic_bitset_impl {
 
+    template<class T>
+    struct max_limit {
+        BOOST_STATIC_CONSTEXPR T value = static_cast<T>(-1);
+    };
+
+    template<class T>
+    BOOST_CONSTEXPR_OR_CONST T max_limit<T>::value;
+
     // Gives (read-)access to the object representation
     // of an object of type T (3.9p4). CANNOT be used
     // on a base sub-object

include/boost/dynamic_bitset/dynamic_bitset.hpp

@@ -384,7 +384,7 @@ private:
     static Block bit_mask(size_type first, size_type last) BOOST_NOEXCEPT
     {
         Block res = (last == bits_per_block - 1)
-            ? static_cast<Block>(~0)
+            ? detail::dynamic_bitset_impl::max_limit<Block>::value
             : ((Block(1) << (last + 1)) - 1);
         res ^= (Block(1) << first) - 1;
         return res;
@@ -406,7 +406,7 @@ private:
     }
     inline static Block set_block_full(Block) BOOST_NOEXCEPT
     {
-        return static_cast<Block>(~0);
+        return detail::dynamic_bitset_impl::max_limit<Block>::value;
     }
     inline static Block reset_block_partial(Block block, size_type first,
         size_type last) BOOST_NOEXCEPT
@@ -764,7 +764,7 @@ resize(size_type num_bits, bool value) // strong guarantee
   const size_type old_num_blocks = num_blocks();
   const size_type required_blocks = calc_num_blocks(num_bits);
 
-  const block_type v = value? ~Block(0) : Block(0);
+  const block_type v = value? detail::dynamic_bitset_impl::max_limit<Block>::value : Block(0);
 
   if (required_blocks != old_num_blocks) {
     m_bits.resize(required_blocks, v); // s.g. (copy)
@@ -1045,7 +1045,7 @@ template <typename Block, typename Allocator>
 dynamic_bitset<Block, Allocator>&
 dynamic_bitset<Block, Allocator>::set()
 {
-  std::fill(m_bits.begin(), m_bits.end(), static_cast<Block>(~0));
+  std::fill(m_bits.begin(), m_bits.end(), detail::dynamic_bitset_impl::max_limit<Block>::value);
   m_zero_unused_bits();
   return *this;
 }
@@ -1138,7 +1138,7 @@ bool dynamic_bitset<Block, Allocator>::all() const
     }
 
     const block_width_type extra_bits = count_extra_bits();
-    block_type const all_ones = static_cast<Block>(~0);
+    block_type const all_ones = detail::dynamic_bitset_impl::max_limit<Block>::value;
 
     if (extra_bits == 0) {
         for (size_type i = 0, e = num_blocks(); i < e; ++i) {
@@ -2107,7 +2107,7 @@ bool dynamic_bitset<Block, Allocator>::m_check_invariants() const
 {
     const block_width_type extra_bits = count_extra_bits();
     if (extra_bits > 0) {
-        const block_type mask = block_type(~0) << extra_bits;
+        const block_type mask = detail::dynamic_bitset_impl::max_limit<Block>::value << extra_bits;
         if ((m_highest_block() & mask) != 0)
             return false;
     }

include/boost/dynamic_bitset/serialization.hpp

@@ -12,7 +12,7 @@
 #define BOOST_DYNAMIC_BITSET_SERIALIZATION_HPP
 
 #include "boost/dynamic_bitset/dynamic_bitset.hpp"
-#include <boost/serialization/vector.hpp>
+#include <boost/core/nvp.hpp>
 
 namespace boost {
 
@@ -23,8 +23,8 @@ namespace boost {
             public:
                 template <typename Ar> 
                 static void serialize(Ar& ar, dynamic_bitset<Block, Allocator>& bs, unsigned) {
-                    ar & serialization::make_nvp("m_num_bits", bs.m_num_bits)
-                       & serialization::make_nvp("m_bits", bs.m_bits);
+                    ar & boost::make_nvp("m_num_bits", bs.m_num_bits)
+                       & boost::make_nvp("m_bits", bs.m_bits);
                 }
         };
 

test/dyn_bitset_unit_tests5.cpp

@@ -31,6 +31,7 @@
 # define BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS
 #endif
 
+#include <boost/serialization/vector.hpp>
 #include <boost/archive/binary_oarchive.hpp>
 #include <boost/archive/binary_iarchive.hpp>
 #include <boost/archive/xml_oarchive.hpp>