Release 1.37.0

[SVN r51178]

CMakeLists.txt

@@ -0,0 +1,24 @@
+#----------------------------------------------------------------------------
+# This file was automatically generated from the original CMakeLists.txt file
+# Add a variable to hold the headers for the library
+set (lib_headers
+    dynamic_bitset.hpp
+    dynamic_bitset_fwd.hpp
+    dynamic_bitset
+)
+
+# Add a library target to the build system
+boost_library_project(
+  dynamic_bitset
+  #  SRCDIRS 
+  TESTDIRS  test
+  HEADERS ${lib_headers}
+  #  DOCDIRS 
+  DESCRIPTION  "A runtime-sized version of std::bitset"
+  MODULARIZED
+  AUTHORS  "Jeremy Siek <jeremy.siek -at- gmail.com>"
+           "Chuck Allison"
+  #  MAINTAINERS 
+)
+
+

dyn_bitset_unit_tests1.cpp

@@ -71,8 +71,8 @@ void run_numeric_ctor_tests( BOOST_EXPLICIT_TEMPLATE_TYPE(Tests)
     };
 
     const T numbers[] = {
-              T(-1), T(-3), T(-8), T(-15), T(mi/2), T(mi),
-        T(0), T(1),  T(3),  T(8),  T(15),  T(ma/2), T(ma)
+           T(-1), T(-3), T(-8), T(-15), mi/2, mi,
+        0,    1,     3,     8,     15,  ma/2, ma
     };
 
     for (std::size_t s = 0; s < BOOST_BITSET_TEST_COUNT(sizes); ++s) {

dynamic_bitset.html

@@ -212,7 +212,6 @@ public:
 
     bool <a href="#is_subset_of">is_subset_of</a>(const dynamic_bitset&amp; a) const;
     bool <a href="#is_proper_subset_of">is_proper_subset_of</a>(const dynamic_bitset&amp; a) const;
-    bool <a href="#intersects">intersects</a>(const dynamic_bitset&amp; a) const;
 
     size_type <a href="#find_first">find_first</a>() const;
     size_type <a href="#find_next">find_next</a>(size_type pos) const;
@@ -1175,19 +1174,6 @@ also set and if <tt>this-&gt;count() &lt; a.count()</tt>.
 Otherwise this function returns false.<br />
 <b>Throws:</b> nothing.
 
-<hr />
-<pre>
-bool <a id=
-"intersects">intersects</a>(const dynamic_bitset&amp; a) const
-</pre>
-
-<b>Requires:</b> <tt>this-&gt;size() == a.size()</tt><br />
-<b>Returns:</b> true if this bitset and <tt>a</tt> intersect.
-That is, it returns true if, there is a bit which is set in this
-bitset, such that the corresponding bit in bitset <tt>a</tt> is
-also set. Otherwise this function returns false.<br />
-<b>Throws:</b> nothing.
-
 <hr />
 <pre>
 size_type <a id = "find_first">find_first</a>() const;

include/boost/dynamic_bitset/dynamic_bitset.hpp

@@ -54,7 +54,7 @@ class dynamic_bitset
   // of VC++ are likely able to digest a more drinking form of the
   // code; but changing it now is probably not worth the risks...]
 
-  BOOST_STATIC_ASSERT((bool)detail::dynamic_bitset_impl::allowed_block_type<Block>::value);
+  BOOST_STATIC_ASSERT(detail::dynamic_bitset_impl::allowed_block_type<Block>::value);
 
 public:
     typedef Block block_type;
@@ -670,7 +670,7 @@ resize(size_type num_bits, bool value) // strong guarantee
 
   if (value && (num_bits > m_num_bits)) {
 
-    const block_width_type extra_bits = count_extra_bits();
+    const size_type extra_bits = count_extra_bits();
     if (extra_bits) {
         assert(old_num_blocks >= 1 && old_num_blocks <= m_bits.size());
 
@@ -999,26 +999,20 @@ dynamic_bitset<Block, Allocator>::count() const
     using detail::dynamic_bitset_impl::access_by_blocks;
     using detail::dynamic_bitset_impl::value_to_type;
 
-#if BOOST_WORKAROUND(__GNUC__, == 4) && (__GNUC_MINOR__ == 3) && (__GNUC_PATCHLEVEL__ == 3)
-    // NOTE: Explicit qualification of "bits_per_block"
-    //       breaks compilation on gcc 4.3.3
-    enum { no_padding = bits_per_block == CHAR_BIT * sizeof(Block) };
-#else
     // NOTE: Explicitly qualifying "bits_per_block" to workaround
     //       regressions of gcc 3.4.x
-    enum { no_padding =
+    const bool no_padding =
         dynamic_bitset<Block, Allocator>::bits_per_block
-        == CHAR_BIT * sizeof(Block) };
-#endif
+        == CHAR_BIT * sizeof(Block);
 
-    enum { enough_table_width = table_width >= CHAR_BIT };
+    const bool enough_table_width = table_width >= CHAR_BIT;
 
-    enum { mode = (no_padding && enough_table_width)
+    const bool mode = (no_padding && enough_table_width)
                           ? access_by_bytes
-                          : access_by_blocks };
+                          : access_by_blocks;
 
     return do_count(m_bits.begin(), num_blocks(), Block(0),
-                    static_cast<value_to_type<(bool)mode> *>(0));
+                                       static_cast<value_to_type<mode> *>(0));
 }
 
 

module.cmake

@@ -0,0 +1 @@
+boost_module(dynamic_bitset DEPENDS detail static_assert)

test/CMakeLists.txt

@@ -0,0 +1,7 @@
+boost_additional_test_dependencies(dynamic_bitset BOOST_DEPENDS test config)
+
+
+boost_test_run(dyn_bitset_unit_tests1 ../dyn_bitset_unit_tests1.cpp)
+boost_test_run(dyn_bitset_unit_tests2 ../dyn_bitset_unit_tests2.cpp)
+boost_test_run(dyn_bitset_unit_tests3 ../dyn_bitset_unit_tests3.cpp)
+boost_test_run(dyn_bitset_unit_tests4 ../dyn_bitset_unit_tests4.cpp)