This commit was manufactured by cvs2svn to create tag

'Version_1_30_2'.

[SVN r19685]

Jamfile

@@ -1,3 +1,40 @@
-# Empty Jamfile because the super project still expects one to appear here.
-# Can be deleted once 'status/Jamfile.v2' has been updated in the super
-# project.
+subproject libs/dynamic_bitset ;
+
+unit-test dyn_bitset_unit_tests1
+    : dyn_bitset_unit_tests1.cpp
+      <lib>../test/build/test_exec_monitor
+    : <include>$(BOOST_ROOT)
+    ;
+
+unit-test dyn_bitset_unit_tests2
+    : dyn_bitset_unit_tests2.cpp
+      <lib>../test/build/test_exec_monitor
+    : <include>$(BOOST_ROOT)
+    ;
+
+unit-test dyn_bitset_unit_tests3
+    : dyn_bitset_unit_tests3.cpp
+      <lib>../test/build/test_exec_monitor
+    : <include>$(BOOST_ROOT)
+    ;
+
+exe timing_tests
+    : timing_tests.cpp
+    : <include>$(BOOST_ROOT)
+    ;
+
+exe example1
+    : example1.cpp
+    : <include>$(BOOST_ROOT)
+    ;
+
+exe example2
+    : example2.cpp
+    : <include>$(BOOST_ROOT)
+    ;
+
+exe example3
+    : example3.cpp
+    : <include>$(BOOST_ROOT)
+    ;
+

bitset_test.hpp

@@ -0,0 +1,727 @@
+// (C) Copyright Jeremy Siek 2001. 
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all
+// copies. This software is provided "as is" without express or
+// implied warranty, and with no claim as to its suitability for any
+// purpose.
+
+#include <vector>
+#include <algorithm> // for std::min
+#include <fstream>
+#include <boost/test/test_tools.hpp>
+
+// Extract the bit at position n from num.
+template <typename Block>
+inline bool nth_bit(Block num, std::size_t n)
+{
+  // Move the nth bit to position 0 and then clear all other bits.
+  return (num >> n) & 1;           
+}
+inline unsigned long max_num(std::size_t num_bits)
+{
+  using namespace std; // for std::pow, VC++ workaround -JGS
+  return (unsigned long)(pow((double)2, (double)num_bits)); 
+}
+
+
+// constructors
+//   default (can't do this generically)
+
+//   from unsigned long
+
+template <typename Bitset>
+struct bitset_test {
+
+  static void from_unsigned_long(Bitset b, unsigned long num)
+  {
+    // initializes the first M bit position to the cooresponding bit
+    // values in val. M is the smaller of N and the value CHAR_BIT *
+    // sizeof(unsigned long)
+
+    // missing from the std?
+    //   if M < N then the remaining bit positions are initialized to zero
+
+    std::size_t N = b.size();
+    std::size_t M = std::min(N, CHAR_BIT * sizeof(unsigned long));
+    std::size_t I;
+    for (I = 0; I < M; ++I)
+      BOOST_CHECK(b[I] == nth_bit(num, I));
+    for (; I < N; ++I)
+      BOOST_CHECK(b[I] == 0);
+  }
+
+  //   from string
+  static void from_string(const std::string& str, std::size_t pos,
+                          std::size_t n)
+  {
+    if (pos > str.size()) {
+      // Not in range, doesn't satisfy precondition.
+    } else {
+      std::size_t rlen = std::min(n, str.size() - pos);
+
+      // Throws invalid_argument if any of the rlen characters in str
+      // beginning at position pos is other than 0 or 1.
+      bool any_non_zero_or_one = false;
+      for (std::size_t i = pos; i < pos + rlen; ++i)
+        if (! (str[i] == '0' || str[i] == '1'))
+          any_non_zero_or_one = true;
+      if (any_non_zero_or_one) {
+        // Input does not satisfy precondition.
+      } else {
+        // Construct an object, initializing the first M bit position to
+        // values determined from the corresponding characters in the
+        // str. M is the smaller of N and rlen.  Character position pos
+        // + M - 1 corresponds to bit position zero.  Subsequent
+        // decreasing character position correspond to increasing bit
+        // positions.
+
+        Bitset b(str, pos, n);
+        std::size_t N = b.size();
+        std::size_t M = std::min(N, rlen);
+        std::size_t j;
+        for (j = 0; j < M; ++j)
+          BOOST_CHECK(b[j] == (str[pos + M - 1 - j] == '1'));
+        // If M < N, remaining bit positions are initialize to zero
+        for (; j < N; ++j)
+          BOOST_CHECK(b[j] == 0);
+      }
+    }
+  }
+
+  typedef typename Bitset::block_type Block;
+
+  // PRE: std::equal(first1, last1, first2) == true
+  static void from_block_range(std::vector<Block> blocks)
+  {
+    {
+      Bitset bset(blocks.begin(), blocks.end());
+      std::size_t n = blocks.size();
+      for (std::size_t b = 0; b < n; ++b) {
+        for (std::size_t i = 0; i < sizeof(Block) * CHAR_BIT; ++i) {
+          std::size_t bit = b * sizeof(Block) * CHAR_BIT + i;
+          BOOST_CHECK(bset[bit] == nth_bit(blocks[b], i));
+        }
+      }
+    }
+    {
+      Bitset bset(blocks.size() * sizeof(Block) * CHAR_BIT);
+      boost::from_block_range(blocks.begin(), blocks.end(), bset);
+      std::size_t n = blocks.size();
+      for (std::size_t b = 0; b < n; ++b) {
+        for (std::size_t i = 0; i < sizeof(Block) * CHAR_BIT; ++i) {
+          std::size_t bit = b * sizeof(Block) * CHAR_BIT + i;
+          BOOST_CHECK(bset[bit] == nth_bit(blocks[b], i));
+        }
+      }
+    }
+  }
+
+  // copy constructor (absent from std::bitset)
+  static void copy_constructor(const Bitset& b)
+  {
+    Bitset copy(b);
+    BOOST_CHECK(b == copy);
+
+    // Changes to the copy do not affect the original
+    if (b.size() > 0) {
+      std::size_t pos = copy.size() / 2;
+      copy.flip(pos);
+      BOOST_CHECK(copy[pos] != b[pos]);
+    }
+  }
+
+  // assignment operator (absent from std::bitset)
+  static void assignment_operator(const Bitset& lhs, const Bitset& rhs)
+  {
+    Bitset b(lhs);
+    b = rhs;
+    BOOST_CHECK(b == rhs);
+    
+    // Changes to the copy do not affect the original
+    if (b.size() > 0) {
+      std::size_t pos = b.size() / 2;
+      b.flip(pos);
+      BOOST_CHECK(b[pos] != rhs[pos]);
+    }
+  }
+
+  static void resize(const Bitset& lhs)
+  {
+    Bitset b(lhs);
+
+    // Test no change in size
+    b.resize(lhs.size());
+    BOOST_CHECK(b == lhs);
+
+    // Test increase in size
+    b.resize(lhs.size() * 2, true);
+
+    std::size_t i;
+    for (i = 0; i < lhs.size(); ++i)
+      BOOST_CHECK(b[i] == lhs[i]);
+    for (; i < b.size(); ++i)
+      BOOST_CHECK(b[i] == true);
+
+    // Test decrease in size
+    b.resize(lhs.size());
+    for (i = 0; i < lhs.size(); ++i)
+      BOOST_CHECK(b[i] == lhs[i]);
+  }
+
+  static void clear(const Bitset& lhs)
+  {
+    Bitset b(lhs);
+    b.clear();
+    BOOST_CHECK(b.size() == 0);
+  }
+
+  static void append_bit(const Bitset& lhs)
+  {
+    Bitset b(lhs);
+    b.push_back(true);
+    BOOST_CHECK(b.size() == lhs.size() + 1);
+    BOOST_CHECK(b[b.size() - 1] == true);
+    for (std::size_t i = 0; i < lhs.size(); ++i)
+      BOOST_CHECK(b[i] == lhs[i]);
+    
+    b.push_back(false);
+    BOOST_CHECK(b.size() == lhs.size() + 2);
+    BOOST_CHECK(b[b.size() - 1] == false);
+    BOOST_CHECK(b[b.size() - 2] == true);
+    for (std::size_t j = 0; j < lhs.size(); ++j)
+      BOOST_CHECK(b[j] == lhs[j]);
+  }
+
+  static void append_block(const Bitset& lhs)
+  {
+    Bitset b(lhs);
+    Block value(128);
+    b.append(value);
+    BOOST_CHECK(b.size() == lhs.size() + Bitset::bits_per_block);
+    for (std::size_t i = 0; i < Bitset::bits_per_block; ++i)
+      BOOST_CHECK(b[lhs.size() + i] == bool((value >> i) & 1));
+  }
+  
+  static void append_block_range(const Bitset& lhs, std::vector<Block> blocks)
+  {
+    Bitset b(lhs), c(lhs);
+    b.append(blocks.begin(), blocks.end());
+    for (typename std::vector<Block>::iterator i = blocks.begin();
+         i != blocks.end(); ++i)
+      c.append(*i);
+    BOOST_CHECK(b == c);
+  }
+
+  // operator[] and reference members
+  // PRE: b[i] == bit_vec[i]
+  static void operator_bracket(const Bitset& lhs, const std::vector<bool>& bit_vec)
+  {
+    Bitset b(lhs);
+    std::size_t i, j, k;
+
+    // x = b[i]
+    // x = ~b[i]
+    for (i = 0; i < b.size(); ++i) {
+      bool x = b[i];
+      BOOST_CHECK(x == bit_vec[i]);
+      x = ~b[i];
+      BOOST_CHECK(x == !bit_vec[i]);
+    }
+    Bitset prev(b);
+
+    // b[i] = x
+    for (j = 0; j < b.size(); ++j) {
+      bool x = !prev[j];
+      b[j] = x;
+      for (k = 0; k < b.size(); ++k)
+        if (j == k)
+          BOOST_CHECK(b[k] == x);
+        else
+          BOOST_CHECK(b[k] == prev[k]);
+      b[j] = prev[j];
+    }
+    b.flip();
+
+    // b[i] = b[j]
+    for (i = 0; i < b.size(); ++i) {
+      b[i] = prev[i];
+      for (j = 0; j < b.size(); ++j) {
+        if (i == j)
+          BOOST_CHECK(b[j] == prev[j]);
+        else
+          BOOST_CHECK(b[j] == !prev[j]);
+      }
+      b[i] = !prev[i];
+    }
+
+    // b[i].flip()
+    for (i = 0; i < b.size(); ++i) {
+      b[i].flip();
+      for (j = 0; j < b.size(); ++j) {
+        if (i == j)
+          BOOST_CHECK(b[j] == prev[j]);
+        else
+          BOOST_CHECK(b[j] == !prev[j]);
+      }
+      b[i].flip();
+    }
+  }
+
+  //===========================================================================
+  // bitwise operators
+
+  // bitwise and assignment
+
+  // PRE: b.size() == rhs.size()
+  static void and_assignment(const Bitset& b, const Bitset& rhs)
+  {
+    Bitset lhs(b);
+    Bitset prev(lhs);
+    lhs &= rhs;
+    // Clears each bit in lhs for which the corresponding bit in rhs is
+    // clear, and leaves all other bits unchanged.
+    for (std::size_t I = 0; I < lhs.size(); ++I)
+      if (rhs[I] == 0)
+        BOOST_CHECK(lhs[I] == 0);
+      else
+        BOOST_CHECK(lhs[I] == prev[I]);
+  }
+
+  // PRE: b.size() == rhs.size()
+  static void or_assignment(const Bitset& b, const Bitset& rhs)
+  {
+    Bitset lhs(b);
+    Bitset prev(lhs);
+    lhs |= rhs;
+    // Sets each bit in lhs for which the corresponding bit in rhs is set, and 
+    // leaves all other bits unchanged.
+    for (std::size_t I = 0; I < lhs.size(); ++I)
+      if (rhs[I] == 1)
+        BOOST_CHECK(lhs[I] == 1);
+      else
+        BOOST_CHECK(lhs[I] == prev[I]);
+  }
+
+  // PRE: b.size() == rhs.size()
+  static void xor_assignment(const Bitset& b, const Bitset& rhs)
+  {
+    Bitset lhs(b);    
+    Bitset prev(lhs);
+    lhs ^= rhs;
+    // Flips each bit in lhs for which the corresponding bit in rhs is set,
+    // and leaves all other bits unchanged.
+    for (std::size_t I = 0; I < lhs.size(); ++I)
+      if (rhs[I] == 1)
+        BOOST_CHECK(lhs[I] == !prev[I]);
+      else
+        BOOST_CHECK(lhs[I] == prev[I]);
+  }
+
+  // PRE: b.size() == rhs.size()
+  static void sub_assignment(const Bitset& b, const Bitset& rhs)
+  {
+    Bitset lhs(b);    
+    Bitset prev(lhs);
+    lhs -= rhs;
+    // Resets each bit in lhs for which the corresponding bit in rhs is set,
+    // and leaves all other bits unchanged.
+    for (std::size_t I = 0; I < lhs.size(); ++I)
+      if (rhs[I] == 1)
+        BOOST_CHECK(lhs[I] == 0);
+      else
+        BOOST_CHECK(lhs[I] == prev[I]);
+  }
+
+  static void shift_left_assignment(const Bitset& b, std::size_t pos)
+  {
+    Bitset lhs(b);    
+    Bitset prev(lhs);
+    lhs <<= pos;
+    // Replaces each bit at position I in lhs with the following value:
+    // - If I < pos, the new value is zero
+    // - If I >= pos, the new value is the previous value of the bit at 
+    //   position I - pos
+    for (std::size_t I = 0; I < lhs.size(); ++I)
+      if (I < pos)
+        BOOST_CHECK(lhs[I] == 0);
+      else
+        BOOST_CHECK(lhs[I] == prev[I - pos]);
+  }
+
+  static void shift_right_assignment(const Bitset& b, std::size_t pos)
+  {
+    Bitset lhs(b);
+    Bitset prev(lhs);
+    lhs >>= pos;
+    // Replaces each bit at position I in lhs with the following value:
+    // - If pos >= N - I, the new value is zero
+    // - If pos < N - I, the new value is the previous value of the bit at 
+    //    position I + pos
+    std::size_t N = lhs.size();
+    for (std::size_t I = 0; I < N; ++I)
+      if (pos >= N - I)
+        BOOST_CHECK(lhs[I] == 0);
+      else
+        BOOST_CHECK(lhs[I] == prev[I + pos]);
+  }
+
+
+  static void set_all(const Bitset& b)
+  {
+    Bitset lhs(b);
+    lhs.set();
+    for (std::size_t I = 0; I < lhs.size(); ++I)
+      BOOST_CHECK(lhs[I] == 1);
+  }
+
+  static void set_one(const Bitset& b, std::size_t pos, bool value)
+  {
+    Bitset lhs(b);
+    std::size_t N = lhs.size();
+    if (pos < N) {
+      Bitset prev(lhs);
+      // Stores a new value in the bit at position pos in lhs.
+      lhs.set(pos, value);
+      BOOST_CHECK(lhs[pos] == value);
+
+      // All other values of lhs remain unchanged
+      for (std::size_t I = 0; I < N; ++I)
+        if (I != pos)
+          BOOST_CHECK(lhs[I] == prev[I]);
+    } else {
+      // Not in range, doesn't satisfy precondition.
+    }
+  }
+
+  static void reset_all(const Bitset& b)
+  {
+    Bitset lhs(b);
+    // Resets all bits in lhs
+    lhs.reset();
+    for (std::size_t I = 0; I < lhs.size(); ++I)
+      BOOST_CHECK(lhs[I] == 0);
+  }
+
+  static void reset_one(const Bitset& b, std::size_t pos)
+  {
+    Bitset lhs(b);
+    std::size_t N = lhs.size();
+    if (pos < N) {
+      Bitset prev(lhs);
+      lhs.reset(pos);
+      // Resets the bit at position pos in lhs
+      BOOST_CHECK(lhs[pos] == 0);
+
+      // All other values of lhs remain unchanged
+      for (std::size_t I = 0; I < N; ++I)
+        if (I != pos)
+          BOOST_CHECK(lhs[I] == prev[I]);
+    } else {
+      // Not in range, doesn't satisfy precondition.
+    }
+  }
+
+  static void operator_flip(const Bitset& b)
+  {
+    Bitset lhs(b);
+    Bitset x(lhs);
+    BOOST_CHECK(~lhs == x.flip());
+  }
+
+  static void flip_all(const Bitset& b)
+  {
+    Bitset lhs(b);
+    std::size_t N = lhs.size();
+    Bitset prev(lhs);
+    lhs.flip();
+    // Toggles all the bits in lhs 
+    for (std::size_t I = 0; I < N; ++I)
+      BOOST_CHECK(lhs[I] == !prev[I]);
+  }
+
+  static void flip_one(const Bitset& b, std::size_t pos)
+  {
+    Bitset lhs(b);
+    std::size_t N = lhs.size();
+    if (pos < N) {
+      Bitset prev(lhs);
+      lhs.flip(pos);
+      // Toggles the bit at position pos in lhs
+      BOOST_CHECK(lhs[pos] == !prev[pos]);
+
+      // All other values of lhs remain unchanged
+      for (std::size_t I = 0; I < N; ++I)
+        if (I != pos)
+          BOOST_CHECK(lhs[I] == prev[I]);
+    } else {
+      // Not in range, doesn't satisfy precondition.
+    }
+  }
+
+  // to_ulong()
+  static void to_ulong(const Bitset& lhs)
+  {
+    std::size_t N = lhs.size();
+    std::size_t n = CHAR_BIT * sizeof(unsigned long);
+    bool will_overflow = false;
+    for (std::size_t I = n; I < N; ++I)
+      if (lhs[I] != 0)
+        will_overflow = true;
+    if (will_overflow) {
+      try {
+        (void)lhs.to_ulong();
+        BOOST_CHECK(false); // It should have thrown and exception
+      } catch (std::overflow_error) {
+        // Good!
+      } catch (...) {
+        BOOST_CHECK(false); // threw the wrong exception
+      }
+    } else {
+      unsigned long num = lhs.to_ulong();
+      // Make sure the number is right
+      for (std::size_t I = 0; I < N; ++I)
+        BOOST_CHECK(lhs[I] == nth_bit(num, I));
+    }
+  }
+
+  // to_string()
+  static void to_string(const Bitset& b)
+  {
+    // Construct a string object of the appropriate type and initializes
+    // it to a string of length N characters. Each character is determined
+    // by the value of its corresponding bit position in b. Character
+    // position N - 1 corresponds to bit position zero. Sebsequent
+    // decreasing character positions correspond to increasing bit
+    // positions. Bit value zero becomes the charactet 0, bit value one
+    // becomes the character 1.
+    std::string str;
+    boost::to_string(b, str);
+    std::size_t N = b.size();
+    BOOST_CHECK(str.size() == b.size());
+    for (std::size_t I = 0; I < b.size(); ++I)
+      BOOST_CHECK(b[I] == 0 ? (str[N - 1 - I] == '0') : (str[N - 1 - I] == '1'));
+  }
+
+  static void count(const Bitset& b)
+  {
+    std::size_t c = b.count();
+    std::size_t c_real = 0;
+    for (std::size_t I = 0; I < b.size(); ++I)
+      if (b[I])
+        ++c_real;
+    BOOST_CHECK(c == c_real);
+  }
+
+  static void size(const Bitset& b)
+  {
+    BOOST_CHECK(Bitset(b).set().count() == b.size());
+  }
+
+  static void any(const Bitset& b)
+  {
+    BOOST_CHECK(b.any() == (b.count() > 0));
+  }
+
+  static void none(const Bitset& b)
+  {
+    BOOST_CHECK(b.none() == (b.count() == 0));
+  }
+
+  static void subset(const Bitset& a, const Bitset& b)
+  {
+    if (a.is_subset_of(b)) {
+      for (std::size_t I = 0; I < a.size(); ++I)
+        if (a[I])
+          BOOST_CHECK(b[I]);
+    } else {
+      bool is_subset = true;
+      for (std::size_t I = 0; I < a.size(); ++I)
+        if (a[I] && !b[I]) {
+          is_subset = false;
+          break;
+        }
+      BOOST_CHECK(is_subset == false);
+    }
+  }
+
+  static void proper_subset(const Bitset& a, const Bitset& b)
+  {
+    if (a.is_proper_subset_of(b)) {
+      for (std::size_t I = 0; I < a.size(); ++I)
+        if (a[I])
+          BOOST_CHECK(b[I]);
+      BOOST_CHECK(a.count() < b.count());
+    } else {
+      bool is_subset = true;
+      for (std::size_t I = 0; I < a.size(); ++I)
+        if (a[I] && !b[I]) {
+          is_subset = false;
+          break;
+        }
+      BOOST_CHECK(is_subset == false || a.count() >= b.count());
+    }
+  }
+
+  static void operator_equal(const Bitset& a, const Bitset& b)
+  {
+    if (a == b) {
+      for (std::size_t I = 0; I < a.size(); ++I)
+        BOOST_CHECK(a[I] == b[I]);
+    } else {
+      if (a.size() == b.size()) {
+        bool diff = false;
+        for (std::size_t I = 0; I < a.size(); ++I)
+          if (a[I] != b[I]) {
+            diff = true;
+            break;
+          }
+        BOOST_CHECK(diff);
+      }
+    }
+  }
+
+  static void operator_not_equal(const Bitset& a, const Bitset& b)
+  {
+    if (a != b) {
+      if (a.size() == b.size()) {
+        bool diff = false;
+        for (std::size_t I = 0; I < a.size(); ++I)
+          if (a[I] != b[I]) {
+            diff = true;
+            break;
+          }
+        BOOST_CHECK(diff);
+      }
+    } else {
+      for (std::size_t I = 0; I < a.size(); ++I)
+        BOOST_CHECK(a[I] == b[I]);
+    }
+  }
+
+  static bool less_than(const Bitset& a, const Bitset& b)
+  {
+    // Compare from most significant to least.
+    // Careful, don't send unsigned int into negative territory!
+    if (a.size() == 0)
+      return false;
+
+    std::size_t I;
+    for (I = a.size() - 1; I > 0; --I)
+      if (a[I] < b[I])
+        return true;
+      else if (a[I] > b[I])
+        return false;
+      // if (a[I] = b[I]) skip to next
+
+    if (a[0] < b[0])
+      return true;
+    else
+      return false;
+  }
+  
+  static void operator_less_than(const Bitset& a, const Bitset& b)
+  {
+    if (less_than(a, b))
+      BOOST_CHECK(a < b);
+    else
+      BOOST_CHECK(!(a < b));
+  }
+
+  static void operator_greater_than(const Bitset& a, const Bitset& b)
+  {
+    if (less_than(a, b) || a == b)
+      BOOST_CHECK(!(a > b));
+    else
+      BOOST_CHECK(a > b);
+  }
+
+  static void operator_less_than_eq(const Bitset& a, const Bitset& b)
+  {
+    if (less_than(a, b) || a == b)
+      BOOST_CHECK(a <= b);
+    else
+      BOOST_CHECK(!(a <= b));
+  }
+
+  static void operator_greater_than_eq(const Bitset& a, const Bitset& b)
+  {
+    if (less_than(a, b))
+      BOOST_CHECK(!(a >= b));
+    else
+      BOOST_CHECK(a >= b);
+  }
+
+  static void test_bit(const Bitset& b, std::size_t pos)
+  {
+    Bitset lhs(b);
+    std::size_t N = lhs.size();
+    if (pos < N) {
+      BOOST_CHECK(lhs.test(pos) == lhs[pos]);
+    } else {
+      // Not in range, doesn't satisfy precondition.
+    }
+  }
+
+  static void operator_shift_left(const Bitset& lhs, std::size_t pos)
+  {
+    Bitset x(lhs);
+    BOOST_CHECK((lhs << pos) == (x <<= pos));
+  }
+
+  static void operator_shift_right(const Bitset& lhs, std::size_t pos)
+  {
+    Bitset x(lhs);
+    BOOST_CHECK((lhs >> pos) == (x >>= pos));
+  }
+
+  // operator|
+  static
+  void operator_or(const Bitset& lhs, const Bitset& rhs)
+  {
+    Bitset x(lhs);
+    BOOST_CHECK((lhs | rhs) == (x |= rhs));
+  }
+
+  // operator&
+  static
+  void operator_and(const Bitset& lhs, const Bitset& rhs)
+  {
+    Bitset x(lhs);
+    BOOST_CHECK((lhs & rhs) == (x &= rhs));
+  }
+
+  // operator^
+  static
+  void operator_xor(const Bitset& lhs, const Bitset& rhs)
+  {
+    Bitset x(lhs);
+    BOOST_CHECK((lhs ^ rhs) == (x ^= rhs));
+  }
+
+  // operator-
+  static
+  void operator_sub(const Bitset& lhs, const Bitset& rhs)
+  {
+    Bitset x(lhs);
+    BOOST_CHECK((lhs - rhs) == (x -= rhs));
+  }
+
+  // operator<<(ostream,
+  // operator>>(istream,
+
+  static
+  void stream_read_write(const Bitset& out, const Bitset& in)
+  {
+    Bitset x(in);
+    {
+      std::ofstream f("tmp");
+      f << out;
+    }
+    {
+      std::ifstream f("tmp");
+      f >> x;
+      BOOST_CHECK(out == x);
+    }
+  }
+
+};

doc/readme

@@ -1 +0,0 @@
-The documentation for the dynamic_bitset library is the top-level index.html file.

dyn_bitset_unit_tests1.cpp

@@ -0,0 +1,258 @@
+// (C) Copyright Jeremy Siek 2001. 
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all
+// copies. This software is provided "as is" without express or
+// implied warranty, and with no claim as to its suitability for any
+// purpose.
+
+#include <iostream>
+#include <fstream>
+#include <cmath> // for pow
+#include <boost/limits.hpp>
+#include <boost/dynamic_bitset.hpp>
+
+#include <boost/test/test_tools.hpp>
+
+#include "bitset_test.hpp"
+
+
+template <typename Block>
+void test_from_ulong(std::size_t n, unsigned long number)
+{
+  boost::dynamic_bitset<Block> b(n, number);
+  bitset_test< boost::dynamic_bitset<Block> >::from_unsigned_long(b, number);
+}
+
+
+template <typename Block>
+void run_test_cases()
+{
+  typedef bitset_test< boost::dynamic_bitset<Block> > Tests;
+
+  std::string long_string(101, '0');
+  for (std::size_t j = 0; j < long_string.size(); ++j)
+    long_string[j] = '0' + (j % 2);
+
+  std::size_t N, ul_size = CHAR_BIT * sizeof(unsigned long), 
+    block_size = CHAR_BIT * sizeof(Block);
+  unsigned long numbers[] = { 0, 40247,
+                              std::numeric_limits<unsigned long>::max() };
+
+  //=====================================================================
+  // Test construction from unsigned long
+  for (std::size_t i = 0; i < 3; ++i) {
+    unsigned long number = numbers[i];
+    N = 0;
+    test_from_ulong<Block>(N, number);
+    
+    N = std::size_t(0.7 * double(ul_size));
+    test_from_ulong<Block>(N, number);
+    
+    N = 1 * ul_size;
+    test_from_ulong<Block>(N, number);
+    
+    N = std::size_t(1.3 * double(ul_size));
+    test_from_ulong<Block>(N, number);
+    
+    N = std::size_t(0.7 * double(block_size));
+    test_from_ulong<Block>(N, number);
+    
+    N = block_size;
+    test_from_ulong<Block>(N, number);
+    
+    N = std::size_t(1.3 * double(block_size));
+    test_from_ulong<Block>(N, number);
+    
+    N = 3 * block_size;
+    test_from_ulong<Block>(N, number);
+  }
+  //=====================================================================
+  // Test construction from a string
+  { 
+    // case pos > str.size()
+    Tests::from_string(std::string(""), 1, 1);
+
+    // invalid arguments
+    Tests::from_string(std::string("x11"), 0, 3);
+    Tests::from_string(std::string("0y1"), 0, 3);
+    Tests::from_string(std::string("10z"), 0, 3);
+
+    // valid arguments
+    Tests::from_string(std::string(""), 0, 0);
+    Tests::from_string(std::string("0"), 0, 1);
+    Tests::from_string(std::string("1"), 0, 1);
+    Tests::from_string(long_string, 0, long_string.size());
+  }
+  //=====================================================================
+  // Test construction from a block range
+  {
+    std::vector<Block> blocks;
+    Tests::from_block_range(blocks);
+  }
+  {
+    std::vector<Block> blocks(3);
+    blocks[0] = static_cast<Block>(0);
+    blocks[1] = static_cast<Block>(1);
+    blocks[2] = ~Block(0);
+    Tests::from_block_range(blocks);
+  }
+  {
+    std::vector<Block> blocks(101);
+    for (typename std::vector<Block>::size_type i = 0; 
+         i < blocks.size(); ++i)
+      blocks[i] = i;
+    Tests::from_block_range(blocks);
+  }
+  //=====================================================================
+  // Test copy constructor
+  {
+    boost::dynamic_bitset<Block> b;
+    Tests::copy_constructor(b);
+  }
+  {
+    boost::dynamic_bitset<Block> b(std::string("0"));
+    Tests::copy_constructor(b);
+  }
+  {
+    boost::dynamic_bitset<Block> b(long_string);
+    Tests::copy_constructor(b);
+  }
+  //=====================================================================
+  // Test assignment operator
+  {
+    boost::dynamic_bitset<Block> a, b;
+    Tests::assignment_operator(a, b);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("1")), b(std::string("0"));
+    Tests::assignment_operator(a, b);
+  }
+  {
+    boost::dynamic_bitset<Block> a(long_string), b(long_string);
+    Tests::assignment_operator(a, b);
+  }
+  //=====================================================================
+  // Test resize
+  {
+    boost::dynamic_bitset<Block> a;
+    Tests::resize(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("0"));
+    Tests::resize(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("1"));
+    Tests::resize(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(long_string);
+    Tests::resize(a);
+  }
+  //=====================================================================
+  // Test clear
+  {
+    boost::dynamic_bitset<Block> a;
+    Tests::clear(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(long_string);
+    Tests::clear(a);
+  }
+  //=====================================================================
+  // Test append bit
+  {
+    boost::dynamic_bitset<Block> a;
+    Tests::append_bit(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("0"));
+    Tests::append_bit(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("1"));
+    Tests::append_bit(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(long_string);
+    Tests::append_bit(a);
+  }
+  //=====================================================================
+  // Test append block
+  {
+    boost::dynamic_bitset<Block> a;
+    Tests::append_block(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("0"));
+    Tests::append_block(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("1"));
+    Tests::append_block(a);
+  }
+  {
+    boost::dynamic_bitset<Block> a(long_string);
+    Tests::append_block(a);
+  }
+  //=====================================================================
+  // Test append block range
+  {
+    boost::dynamic_bitset<Block> a;
+    std::vector<Block> blocks;
+    Tests::append_block_range(a, blocks);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("0"));
+    std::vector<Block> blocks(3);
+    blocks[0] = static_cast<Block>(0);
+    blocks[1] = static_cast<Block>(1);
+    blocks[2] = ~Block(0);
+    Tests::append_block_range(a, blocks);
+  }
+  {
+    boost::dynamic_bitset<Block> a(std::string("1"));
+    std::vector<Block> blocks(101);
+    for (typename std::vector<Block>::size_type i = 0; 
+         i < blocks.size(); ++i)
+      blocks[i] = i;
+    Tests::append_block_range(a, blocks);
+  }
+  {
+    boost::dynamic_bitset<Block> a(long_string);
+    std::vector<Block> blocks(3);
+    blocks[0] = static_cast<Block>(0);
+    blocks[1] = static_cast<Block>(1);
+    blocks[2] = ~Block(0);
+    Tests::append_block_range(a, blocks);
+  }
+  //=====================================================================
+  // Test bracket operator
+  {
+    boost::dynamic_bitset<Block> b1;
+    std::vector<bool> bitvec1;
+    Tests::operator_bracket(b1, bitvec1);
+  }
+  {
+    boost::dynamic_bitset<Block> b(std::string("1"));
+    std::vector<bool> bit_vec(1, true);
+    Tests::operator_bracket(b, bit_vec);
+  }
+  {
+    boost::dynamic_bitset<Block> b(long_string);
+    std::size_t n = long_string.size();
+    std::vector<bool> bit_vec(n);
+    for (std::size_t i = 0; i < n; ++i)
+      bit_vec[i] = long_string[n - 1 - i] == '0' ? 0 : 1;
+    Tests::operator_bracket(b, bit_vec);
+  }
+}
+
+int
+test_main(int, char*[])
+{ 
+  run_test_cases<unsigned char>();
+  run_test_cases<unsigned short>();
+  run_test_cases<unsigned long>();
+  return EXIT_SUCCESS;
+}

dyn_bitset_unit_tests2.cpp

@@ -1,27 +1,27 @@
-// -----------------------------------------------------------
-//              Copyright (c) 2001 Jeremy Siek
-//           Copyright (c) 2003-2006 Gennaro Prota
-//             Copyright (c) 2014 Ahmed Charles
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
+// (C) Copyright Jeremy Siek 2001. 
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all
+// copies. This software is provided "as is" without express or
+// implied warranty, and with no claim as to its suitability for any
+// purpose.
+ 
+#include <iostream>
+#include <fstream>
+#include <cmath> // for pow
+#include <boost/dynamic_bitset.hpp>
+
+#include <boost/test/test_tools.hpp>
 
 #include "bitset_test.hpp"
-#include "boost/dynamic_bitset/dynamic_bitset.hpp"
-#include "boost/config.hpp"
-
 
 template <typename Block>
-void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
+void run_test_cases()
 {
-  typedef boost::dynamic_bitset<Block> bitset_type;
-  typedef bitset_test< bitset_type > Tests;
-  const int bits_per_block = bitset_type::bits_per_block;
+  typedef bitset_test< boost::dynamic_bitset<Block> > Tests;
 
-  std::string long_string = get_long_string();
+  std::string long_string(101, '0');
+  for (std::size_t i = 0; i < long_string.size(); ++i)
+    long_string[i] = '0' + (i % 2);
 
   //=====================================================================
   // Test operator&=
@@ -99,31 +99,8 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
   // Test operator<<=
   { // case pos == 0
     std::size_t pos = 0;
-    {
-      boost::dynamic_bitset<Block> b;
-      Tests::shift_left_assignment(b, pos);
-    }
-    {
-      boost::dynamic_bitset<Block> b(std::string("1010"));
-      Tests::shift_left_assignment(b, pos);
-    }
-    {
-      boost::dynamic_bitset<Block> b(long_string);
-      Tests::shift_left_assignment(b, pos);
-    }
-  }
-  {
-    // test with both multiple and
-    // non multiple of bits_per_block
-    const int how_many = 10;
-    for (int i = 1; i <= how_many; ++i) {
-        std::size_t     multiple = i * bits_per_block;
-        std::size_t non_multiple = multiple - 1;
-        boost::dynamic_bitset<Block> b(long_string);
-
-        Tests::shift_left_assignment(b, multiple);
-        Tests::shift_left_assignment(b, non_multiple);
-    }
+    boost::dynamic_bitset<Block> b(std::string("1010"));
+    Tests::shift_left_assignment(b, pos);
   }
   { // case pos == size()/2
     std::size_t pos = long_string.size() / 2;
@@ -139,32 +116,8 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
   // Test operator>>=
   { // case pos == 0
     std::size_t pos = 0;
-    {
-      boost::dynamic_bitset<Block> b;
-      Tests::shift_right_assignment(b, pos);
-    }
-    {
-      boost::dynamic_bitset<Block> b(std::string("1010"));
-      Tests::shift_right_assignment(b, pos);
-    }
-    {
-      boost::dynamic_bitset<Block> b(long_string);
-      Tests::shift_right_assignment(b, pos);
-    }
-  }
-  {
-    // test with both multiple and
-    // non multiple of bits_per_block
-    const int how_many = 10;
-    for (int i = 1; i <= how_many; ++i) {
-        std::size_t     multiple = i * bits_per_block;
-        std::size_t non_multiple = multiple - 1;
-        boost::dynamic_bitset<Block> b(long_string);
-
-        Tests::shift_right_assignment(b, multiple);
-        Tests::shift_right_assignment(b, non_multiple);
-    }
-
+    boost::dynamic_bitset<Block> b(std::string("1010"));
+    Tests::shift_right_assignment(b, pos);
   }
   { // case pos == size()/2
     std::size_t pos = long_string.size() / 2;
@@ -195,17 +148,14 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
   { // case pos >= b.size()
     boost::dynamic_bitset<Block> b;
     Tests::set_one(b, 0, true);
-    Tests::set_one(b, 0, false);
   }
   { // case pos < b.size()
     boost::dynamic_bitset<Block> b(std::string("0"));
     Tests::set_one(b, 0, true);
-    Tests::set_one(b, 0, false);
   }
   { // case pos == b.size() / 2
     boost::dynamic_bitset<Block> b(long_string);
     Tests::set_one(b, long_string.size()/2, true);
-    Tests::set_one(b, long_string.size()/2, false);
   }
   //=====================================================================
   // Test b.reset()
@@ -222,7 +172,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     Tests::reset_all(b);
   }
   //=====================================================================
-  // Test b.reset(pos)
+  // Test b.reset(pos)  
   { // case pos >= b.size()
     boost::dynamic_bitset<Block> b;
     Tests::reset_one(b, 0);
@@ -264,7 +214,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     Tests::flip_all(b);
   }
   //=====================================================================
-  // Test b.flip(pos)
+  // Test b.flip(pos)  
   { // case pos >= b.size()
     boost::dynamic_bitset<Block> b;
     Tests::flip_one(b, 0);
@@ -280,15 +230,11 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
 }
 
 int
-test_main(int, char*[])
-{
+test_main(int argc, char*[])
+{ 
   run_test_cases<unsigned char>();
   run_test_cases<unsigned short>();
-  run_test_cases<unsigned int>();
   run_test_cases<unsigned long>();
-# ifdef BOOST_HAS_LONG_LONG
-  run_test_cases< ::boost::ulong_long_type>();
-# endif
-
-  return 0;
+  return EXIT_SUCCESS;
 }
+ 

dyn_bitset_unit_tests3.cpp

@@ -1,48 +1,30 @@
-// -----------------------------------------------------------
-//              Copyright (c) 2001 Jeremy Siek
-//           Copyright (c) 2003-2006 Gennaro Prota
-//             Copyright (c) 2014 Ahmed Charles
-//          Copyright (c) 2014 Riccardo Marcangelo
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
+// (C) Copyright Jeremy Siek 2001. 
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all
+// copies. This software is provided "as is" without express or
+// implied warranty, and with no claim as to its suitability for any
+// purpose.
+
+#include <iostream>
+#include <fstream>
+#include <cmath> // for pow
+#include <boost/dynamic_bitset.hpp>
+
+#include <boost/test/test_tools.hpp>
 
-#include <assert.h>
 #include "bitset_test.hpp"
-#include "boost/dynamic_bitset/dynamic_bitset.hpp"
-#include "boost/limits.hpp"
-#include "boost/config.hpp"
-
 
 template <typename Block>
-void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
+void run_test_cases()
 {
-  // a bunch of typedefs which will be handy later on
-  typedef boost::dynamic_bitset<Block> bitset_type;
-  typedef bitset_test<bitset_type> Tests;
-  // typedef typename bitset_type::size_type size_type; // unusable with Borland 5.5.1
+  typedef bitset_test< boost::dynamic_bitset<Block> > Tests;
 
-  std::string long_string = get_long_string();
-  std::size_t ul_width = std::numeric_limits<unsigned long>::digits;
+  std::string long_string(101, '0');
+  for (std::size_t i = 0; i < long_string.size(); ++i)
+    long_string[i] = '0' + (i % 2);
+
+  std::size_t ul_size = CHAR_BIT * sizeof(unsigned long);
 
-  //=====================================================================
-  // Test b.empty()
-  {
-    bitset_type b;
-    Tests::empty(b);
-  }
-  {
-    bitset_type b(1, 1ul);
-    Tests::empty(b);
-  }
-  {
-    bitset_type b(bitset_type::bits_per_block
-                  + bitset_type::bits_per_block/2, 15ul);
-    Tests::empty(b);
-  }
   //=====================================================================
   // Test b.to_long()
   {
@@ -50,21 +32,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     Tests::to_ulong(b);
   }
   {
-    boost::dynamic_bitset<Block> b(std::string("1"));
-    Tests::to_ulong(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(bitset_type::bits_per_block,
-                                   static_cast<unsigned long>(-1));
-    Tests::to_ulong(b);
-  }
-  {
-    std::string str(ul_width - 1, '1');
-    boost::dynamic_bitset<Block> b(str);
-    Tests::to_ulong(b);
-  }
-  {
-    std::string ul_str(ul_width, '1');
+    std::string ul_str(ul_size, '1');
     boost::dynamic_bitset<Block> b(ul_str);
     Tests::to_ulong(b);
   }
@@ -96,14 +64,6 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     boost::dynamic_bitset<Block> b(std::string("0"));
     Tests::count(b);
   }
-  {
-    boost::dynamic_bitset<Block> b(std::string("1"));
-    Tests::count(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(8, 255ul);
-    Tests::count(b);
-  }
   {
     boost::dynamic_bitset<Block> b(long_string);
     Tests::count(b);
@@ -123,103 +83,32 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     Tests::size(b);
   }
   //=====================================================================
-  // Test b.capacity()
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::capacity_test_one(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(100);
-    Tests::capacity_test_two(b);
-  }
-  //=====================================================================
-  // Test b.reserve()
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::reserve_test_one(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(100);
-    Tests::reserve_test_two(b);
-  }
-  //=====================================================================
-  // Test b.shrink_to_fit()
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::shrink_to_fit_test_one(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(100);
-    Tests::shrink_to_fit_test_two(b);
-  }
-  //=====================================================================
-  // Test b.all()
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::all(b);
-    Tests::all(~b);
-    Tests::all(b.set());
-    Tests::all(b.reset());
-  }
-  {
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::all(b);
-    Tests::all(~b);
-    Tests::all(b.set());
-    Tests::all(b.reset());
-  }
-  {
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::all(b);
-    Tests::all(~b);
-    Tests::all(b.set());
-    Tests::all(b.reset());
-  }
-  //=====================================================================
   // Test b.any()
   {
     boost::dynamic_bitset<Block> b;
     Tests::any(b);
-    Tests::any(~b);
-    Tests::any(b.set());
-    Tests::any(b.reset());
   }
   {
     boost::dynamic_bitset<Block> b(std::string("0"));
     Tests::any(b);
-    Tests::any(~b);
-    Tests::any(b.set());
-    Tests::any(b.reset());
   }
   {
     boost::dynamic_bitset<Block> b(long_string);
     Tests::any(b);
-    Tests::any(~b);
-    Tests::any(b.set());
-    Tests::any(b.reset());
   }
   //=====================================================================
   // Test b.none()
   {
     boost::dynamic_bitset<Block> b;
     Tests::none(b);
-    Tests::none(~b);
-    Tests::none(b.set());
-    Tests::none(b.reset());
   }
   {
     boost::dynamic_bitset<Block> b(std::string("0"));
     Tests::none(b);
-    Tests::none(~b);
-    Tests::none(b.set());
-    Tests::none(b.reset());
   }
   {
     boost::dynamic_bitset<Block> b(long_string);
     Tests::none(b);
-    Tests::none(~b);
-    Tests::none(b.set());
-    Tests::none(b.reset());
   }
   //=====================================================================
   // Test a.is_subset_of(b)
@@ -278,132 +167,6 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     Tests::proper_subset(a, b);
   }
   //=====================================================================
-  // Test intersects
-  {
-    bitset_type a; // empty
-    bitset_type b;
-    Tests::intersects(a, b);
-  }
-  {
-    bitset_type a;
-    bitset_type b(5, 8ul);
-    Tests::intersects(a, b);
-  }
-  {
-    bitset_type a(8, 0ul);
-    bitset_type b(15, 0ul);
-    b[9] = 1;
-    Tests::intersects(a, b);
-  }
-  {
-    bitset_type a(15, 0ul);
-    bitset_type b(22, 0ul);
-    a[14] = b[14] = 1;
-    Tests::intersects(a, b);
-  }
-  //=====================================================================
-  // Test find_first
-  {
-      // empty bitset
-      bitset_type b;
-      Tests::find_first(b);
-  }
-  {
-      // bitset of size 1
-      bitset_type b(1, 1ul);
-      Tests::find_first(b);
-  }
-  {
-      // all-0s bitset
-      bitset_type b(4 * bitset_type::bits_per_block, 0ul);
-      Tests::find_first(b);
-  }
-  {
-      // first bit on
-      bitset_type b(1, 1ul);
-      Tests::find_first(b);
-  }
-  {
-      // last bit on
-      bitset_type b(4 * bitset_type::bits_per_block - 1, 0ul);
-      b.set(b.size() - 1);
-      Tests::find_first(b);
-  }
-  //=====================================================================
-  // Test find_next
-  {
-      // empty bitset
-      bitset_type b;
-
-      // check
-      Tests::find_next(b, 0);
-      Tests::find_next(b, 1);
-      Tests::find_next(b, 200);
-      Tests::find_next(b, b.npos);
-  }
-  {
-      // bitset of size 1 (find_next can never find)
-      bitset_type b(1, 1ul);
-
-      // check
-      Tests::find_next(b, 0);
-      Tests::find_next(b, 1);
-      Tests::find_next(b, 200);
-      Tests::find_next(b, b.npos);
-  }
-  {
-      // all-1s bitset
-      bitset_type b(16 * bitset_type::bits_per_block);
-      b.set();
-
-      // check
-      const typename bitset_type::size_type larger_than_size = 5 + b.size();
-      for(typename bitset_type::size_type i = 0; i <= larger_than_size; ++i) {
-          Tests::find_next(b, i);
-      }
-      Tests::find_next(b, b.npos);
-  }
-  {
-      // a bitset with 1s at block boundary only
-      const int num_blocks = 32;
-      const int block_width = bitset_type::bits_per_block;
-
-      bitset_type b(num_blocks * block_width);
-      typename bitset_type::size_type i = block_width - 1;
-      for ( ; i < b.size(); i += block_width) {
-
-        b.set(i);
-        typename bitset_type::size_type first_in_block = i - (block_width - 1);
-        b.set(first_in_block);
-      }
-
-      // check
-      const typename bitset_type::size_type larger_than_size = 5 + b.size();
-      for (i = 0; i <= larger_than_size; ++i) {
-          Tests::find_next(b, i);
-      }
-      Tests::find_next(b, b.npos);
-
-  }
-  {
-      // bitset with alternate 1s and 0s
-      const typename bitset_type::size_type sz = 1000;
-      bitset_type b(sz);
-
-      typename bitset_type::size_type i = 0;
-      for ( ; i < sz; ++i) {
-        b[i] = (i%2 == 0);
-      }
-
-      // check
-      const typename bitset_type::size_type larger_than_size = 5 + b.size();
-      for (i = 0; i <= larger_than_size; ++i) {
-          Tests::find_next(b, i);
-      }
-      Tests::find_next(b, b.npos);
-
-  }
-  //=====================================================================
   // Test operator==
   {
     boost::dynamic_bitset<Block> a, b;
@@ -473,10 +236,6 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     boost::dynamic_bitset<Block> a(std::string("1")), b(std::string("1"));
     Tests::operator_less_than(a, b);
   }
-  {
-    boost::dynamic_bitset<Block> a(std::string("10")), b(std::string("11"));
-    Tests::operator_less_than(a, b);
-  }
   {
     boost::dynamic_bitset<Block> a(long_string), b(long_string);
     Tests::operator_less_than(a, b);
@@ -628,7 +387,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     assert(a >= b);
   }
   //=====================================================================
-  // Test b.test(pos)
+  // Test b.test(pos)  
   { // case pos >= b.size()
     boost::dynamic_bitset<Block> b;
     Tests::test_bit(b, 0);
@@ -642,24 +401,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     Tests::test_bit(b, long_string.size()/2);
   }
   //=====================================================================
-  // Test b.test_set(pos)
-  { // case pos >= b.size()
-    boost::dynamic_bitset<Block> b;
-    Tests::test_set_bit(b, 0, true);
-    Tests::test_set_bit(b, 0, false);
-  }
-  { // case pos < b.size()
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::test_set_bit(b, 0, true);
-    Tests::test_set_bit(b, 0, false);
-  }
-  { // case pos == b.size() / 2
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::test_set_bit(b, long_string.size() / 2, true);
-    Tests::test_set_bit(b, long_string.size() / 2, false);
-  }
-  //=====================================================================
-  // Test b << pos
+  // Test b << pos  
   { // case pos == 0
     std::size_t pos = 0;
     boost::dynamic_bitset<Block> b(std::string("1010"));
@@ -676,7 +418,7 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     Tests::operator_shift_left(b, pos);
   }
   //=====================================================================
-  // Test b >> pos
+  // Test b >> pos  
   { // case pos == 0
     std::size_t pos = 0;
     boost::dynamic_bitset<Block> b(std::string("1010"));
@@ -764,18 +506,30 @@ void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
     boost::dynamic_bitset<Block> lhs(long_string.size(), 1), rhs(long_string);
     Tests::operator_sub(lhs, rhs);
   }
+  //=====================================================================
+  // Test stream operator<< and operator>>
+  {
+    boost::dynamic_bitset<Block> b;
+    boost::dynamic_bitset<Block> x(b.size());
+    Tests::stream_read_write(b, x);
+  }
+  {
+    boost::dynamic_bitset<Block> b(std::string("0"));
+    boost::dynamic_bitset<Block> x(b.size());
+    Tests::stream_read_write(b, x);
+  }
+  {
+    boost::dynamic_bitset<Block> b(long_string);
+    boost::dynamic_bitset<Block> x(b.size());
+    Tests::stream_read_write(b, x);
+  }
 }
 
 int
 test_main(int, char*[])
-{
+{ 
   run_test_cases<unsigned char>();
   run_test_cases<unsigned short>();
-  run_test_cases<unsigned int>();
   run_test_cases<unsigned long>();
-# ifdef BOOST_HAS_LONG_LONG
-  run_test_cases< ::boost::ulong_long_type>();
-# endif
-
-  return 0;
+  return EXIT_SUCCESS;
 }

example/Jamfile

@@ -1,24 +0,0 @@
-// -----------------------------------------------------------
-//              Copyright (c) 2002 Gennaro Prota
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
-exe timing_tests 
-    : timing_tests.cpp 
-    ;
-
-exe example1
-    : example1.cpp
-    ;
-
-exe example2
-    : example2.cpp
-    ;
-
-exe example3
-    : example3.cpp
-    ;
-

example/example1.cpp

@@ -1,35 +0,0 @@
-// (C) Copyright Jeremy Siek 2001.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-
-
-// An example of setting and reading some bits. Note that operator[]
-// goes from the least-significant bit at 0 to the most significant
-// bit at size()-1. The operator<< for dynamic_bitset prints the
-// bitset from most-significant to least-significant, since that is
-// the format most people are used to reading.
-//
-//  The output is:
-//
-//  11001
-//  10011
-// ---------------------------------------------------------------------
-
-#include <iostream>
-#include <boost/dynamic_bitset.hpp>
-
-int main()
-{
-    boost::dynamic_bitset<> x(5); // all 0's by default
-    x[0] = 1;
-    x[1] = 1;
-    x[4] = 1;
-    for (boost::dynamic_bitset<>::size_type i = 0; i < x.size(); ++i)
-        std::cout << x[i];
-    std::cout << "\n";
-    std::cout << x << "\n";
-
-    return 0;
-}

example/example2.cpp

@@ -1,32 +0,0 @@
-// (C) Copyright Jeremy Siek 2001.
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-//  Sample output:
-//
-//  bits(0) = 00
-//  bits(1) = 01
-//  bits(2) = 10
-//  bits(3) = 11
-
-
-#include <iostream>
-#include <boost/dynamic_bitset.hpp>
-
-int main()
-{
-  const boost::dynamic_bitset<> b0(2, 0ul);
-  std::cout << "bits(0) = " << b0 << std::endl;
-
-  const boost::dynamic_bitset<> b1(2, 1ul);
-  std::cout << "bits(1) = " << b1 << std::endl;
-
-  const boost::dynamic_bitset<> b2(2, 2ul);
-  std::cout << "bits(2) = " << b2 << std::endl;
-
-  const boost::dynamic_bitset<> b3(2, 3ul);
-  std::cout << "bits(3) = " << b3 << std::endl;
-
-  return 0;
-}

example/example3.cpp

@@ -1,71 +0,0 @@
-// Copyright (c) 2001 Jeremy Siek
-// Copyright (c) 2008 Gennaro Prota
-// Distributed under the Boost Software License, Version 1.0. (See
-// accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-//
-// Sample run:
-//
-// mask     = 101010101010
-// x.size() = 0
-// Enter a bitset in binary: x = 100100010
-//
-// Input number:             100100010
-// x.size() is now:          9
-// As unsigned long:         290
-// Mask (possibly resized):  010101010
-// And with mask:            000100010
-// Or with mask:             110101010
-// Shifted left by 1:        001000100
-// Shifted right by 1:       010010001
-
-
-
-#include "boost/dynamic_bitset.hpp"
-
-#include <ostream>
-#include <iostream>
-
-int main()
-{
-    boost::dynamic_bitset<> mask(12, 2730ul);
-    std::cout << "mask     = " << mask << std::endl;
-
-    boost::dynamic_bitset<> x;
-    std::cout << "x.size() = " << x.size() << std::endl;
-
-    std::cout << "Enter a bitset in binary: x = " << std::flush;
-    if (std::cin >> x) {
-        const std::size_t sz = x.size();
-        std::cout << std::endl;
-        std::cout << "Input number:             " << x << std::endl;
-        std::cout << "x.size() is now:          " << sz << std::endl;
-
-        bool fits_in_ulong = true;
-        unsigned long ul = 0;
-        try {
-            ul = x.to_ulong();
-        } catch(std::overflow_error &) {
-            fits_in_ulong = false;
-        }
-
-        std::cout << "As unsigned long:         ";
-        if(fits_in_ulong) {
-            std::cout << ul;
-        } else {
-            std::cout << "(overflow exception)";
-        }
-
-        std::cout << std::endl;
-
-        mask.resize(sz);
-
-        std::cout << "Mask (possibly resized):  " << mask << std::endl;
-
-        std::cout << "And with mask:            " << (x & mask) << std::endl;
-        std::cout << "Or with mask:             " << (x | mask) << std::endl;
-        std::cout << "Shifted left by 1:        " << (x << 1) << std::endl;
-        std::cout << "Shifted right by 1:       " << (x >> 1) << std::endl;
-    }
-    return 0;
-}

example/timing_tests.cpp

@@ -1,142 +0,0 @@
-// -----------------------------------------------------------
-//
-//           Copyright (c) 2003-2004 Gennaro Prota
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
-
-//  boost::dynamic_bitset timing tests
-//
-//  NOTE:
-//  ~~~~~
-//   This is a preliminary, incomplete version.
-//
-//   If you are interested in having more benchmarks please make a
-//   request on the boost list, which could encourage me to continue
-//   this work.
-
-//   Also, if you use boost::dynamic_bitset on a platform where
-//   CHAR_BIT >= 9 I suggest experimenting with the size of the count
-//   table in detail/dynamic_bitset.hpp and report any interesting
-//   discovery on the list as well.
-
-//   You might also want to try both counting methods (by_bytes vs.
-//   by_blocks) to see if the one that is selected automatically is
-//   actually the fastest on your system.
-
-//
-//
-// -----------------------------------------------------------------------//
-
-
-#include "boost/config.hpp"
-
-#if  defined (__STL_CONFIG_H) && !defined (__STL_USE_NEW_IOSTREAMS)
-  // for pre 3.0 versions of libstdc++
-# define BOOST_OLD_IOSTREAMS
-#endif
-// ------------------------------------------------- //
-
-#include <typeinfo>
-#include <iostream>
-#if !defined(BOOST_OLD_IOSTREAMS)
-# include <ostream>
-#endif
-
-
-#include "boost/cstdlib.hpp"
-#include "boost/version.hpp"
-#include "boost/timer.hpp"
-#include "boost/dynamic_bitset.hpp"
-
-
-namespace {
-
-    // the m_ prefixes, below, are mainly to avoid problems with g++:
-    // see http://gcc.gnu.org/ml/gcc-bugs/1999-03n/msg00884.html
-    //
-    class boost_version {
-        int m_major;
-        int m_minor;
-        int m_subminor;
-
-    public:
-        boost_version(unsigned long v = BOOST_VERSION):
-          m_major(v / 100000), m_minor(v / 100 % 1000), m_subminor(v % 100) {}
-
-        friend std::ostream & operator<<(std::ostream &, const boost_version &);
-    };
-
-
-    // give up using basic_ostream, to avoid headaches with old libraries
-     std::ostream& operator<<(std::ostream& os, const boost_version & v) {
-        return os << v.m_major << '.' << v.m_minor << '.' << v.m_subminor;
-     }
-
-}
-
-
-void prologue()
-{
-    std::cout << '\n';
-    std::cout << "Compiler: " << BOOST_COMPILER << '\n';
-    std::cout << "Std lib : " << BOOST_STDLIB << '\n';
-    std::cout << "Boost v.: " << boost_version() << '\n';
-
-    std::cout << '\n';
-}
-
-
-
-template <typename T>
-void timing_test(T* = 0) // dummy parameter to workaround VC6
-{
-
-    const unsigned long num = 30 * 100000;
-
-
-    // This variable is printed at the end of the test,
-    // to prevent the optimizer from removing the call to
-    // count() in the loop below.
-    typename boost::dynamic_bitset<T>::size_type dummy = 0;
-
-    std::cout << "\nTimings for dynamic_bitset<" << typeid(T).name()
-              << ">  [" << num << " iterations]\n";
-    std::cout << "--------------------------------------------------\n";
-
-    {
-        boost::timer time;
-
-        const typename boost::dynamic_bitset<T>::size_type sz = 5000;
-        for (unsigned long i = 0; i < num; ++i) {
-            boost::dynamic_bitset<T> bs(sz, i);
-            dummy += bs.count();
-        }
-
-        const double elaps = time.elapsed();
-        std::cout << "Elapsed: " << elaps << '\n';
-    }
-
-    std::cout << "(total count: " << dummy << ")\n\n";
-}
-
-
-
-int main()
-{
-    prologue();
-
-    timing_test<unsigned char>();
-    timing_test<unsigned short>();
-    timing_test<unsigned int>();
-    timing_test<unsigned long>();
-# ifdef BOOST_HAS_LONG_LONG
-    timing_test< ::boost::ulong_long_type>();
-# endif
-
-    return boost::exit_success;
-}
-

example1.cpp

@@ -0,0 +1,26 @@
+// (C) Copyright Jeremy Siek 2001. Permission to copy, use, modify,
+// sell and distribute this software is granted provided this
+// copyright notice appears in all copies. This software is provided
+// "as is" without express or implied warranty, and with no claim as
+// to its suitability for any purpose.
+
+// Sample output:
+//  1
+//  1
+//  0
+//  0
+//  1
+
+#include <iostream>
+#include <boost/dynamic_bitset.hpp>
+int main() {
+  boost::dynamic_bitset<> x(5); // all 0's by default
+  x[0] = 1;
+  x[1] = 1;
+  x[4] = 1;
+  for (boost::dynamic_bitset<>::size_type i = 0; i < x.size(); ++i)
+    std::cout << x[i];
+  std::cout << "\n";
+  std::cout << x << "\n";
+  return EXIT_SUCCESS;
+}

example2.cpp

@@ -0,0 +1,30 @@
+// (C) Copyright Jeremy Siek 2001. Permission to copy, use, modify,
+// sell and distribute this software is granted provided this
+// copyright notice appears in all copies. This software is provided
+// "as is" without express or implied warranty, and with no claim as
+// to its suitability for any purpose.
+//
+// Sample output:
+//  bits(0) = 00
+//  bits(1) = 01
+//  bits(2) = 10
+//  bits(3) = 11
+
+#include <iostream>
+#include <boost/dynamic_bitset.hpp>
+int main()
+{
+  const boost::dynamic_bitset<> b0(2, 0ul); 
+  std::cout << "bits(0) = " << b0 << std::endl;
+
+  const boost::dynamic_bitset<> b1(2, 1ul); 
+  std::cout << "bits(1) = " << b1 << std::endl;
+
+  const boost::dynamic_bitset<> b2(2, 2ul); 
+  std::cout << "bits(2) = " << b2 << std::endl;
+
+  const boost::dynamic_bitset<> b3(2, 3ul); 
+  std::cout << "bits(3) = " << b3 << std::endl;
+
+  return EXIT_SUCCESS;
+}

example3.cpp

@@ -0,0 +1,36 @@
+// (C) Copyright Jeremy Siek 2001. Permission to copy, use, modify,
+// sell and distribute this software is granted provided this
+// copyright notice appears in all copies. This software is provided
+// "as is" without express or implied warranty, and with no claim as
+// to its suitability for any purpose.
+//
+// Sample output:
+//  mask =      101010101010
+//  Enter a 12-bit bitset in binary: 100110101101
+//  x =        100110101101
+//  As ulong:  2477
+//  And with mask: 100010101000
+//  Or with mask:  101110101111
+
+
+#include <iostream>
+#include <boost/dynamic_bitset.hpp>
+
+int main(int, char*[]) {
+  const boost::dynamic_bitset<> mask(12, 2730ul); 
+  std::cout << "mask = " << mask << std::endl;
+
+  boost::dynamic_bitset<> x(12);
+  std::cout << "x.size()=" << x.size() << std::endl;
+
+  std::cout << "Enter a 12-bit bitset in binary: " << std::flush;
+  if (std::cin >> x) {
+    std::cout << "input number:     " << x << std::endl;
+    std::cout << "As unsigned long: " << x.to_ulong() << std::endl;
+    std::cout << "And with mask:    " << (x & mask) << std::endl;
+    std::cout << "Or with mask:     " << (x | mask) << std::endl;
+    std::cout << "Shifted left:     " << (x << 1) << std::endl;
+    std::cout << "Shifted right:    " << (x >> 1) << std::endl;
+  }
+  return EXIT_SUCCESS;
+}

include/boost/detail/dynamic_bitset.hpp

@@ -1,90 +1,129 @@
-// -----------------------------------------------------------
+// (C) Copyright Chuck Allison and Jeremy Siek 2001, 2002.
 //
-//   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
-//        Copyright (c) 2003-2006, 2008 Gennaro Prota
-//
-// Copyright (c) 2014 Glen Joseph Fernandes
-// glenfe at live dot com
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all
+// copies. This software is provided "as is" without express or
+// implied warranty, and with no claim as to its suitability for any
+// purpose.
+
+// With optimizations by Gennaro Prota.
 
 #ifndef BOOST_DETAIL_DYNAMIC_BITSET_HPP
 #define BOOST_DETAIL_DYNAMIC_BITSET_HPP
 
-#include <memory>
-#include <cstddef>
 #include "boost/config.hpp"
-#include "boost/detail/workaround.hpp"
+#include "boost/detail/iterator.hpp"
 
+#if !(defined(BOOST_NO_MEMBER_TEMPLATE_FRIENDS) || defined(__BORLANDC__))
+#define BOOST_DYN_BITSET_USE_FRIENDS
+#endif
 
 namespace boost {
 
   namespace detail {
-  namespace dynamic_bitset_impl {
 
-    // Gives (read-)access to the object representation
-    // of an object of type T (3.9p4). CANNOT be used
-    // on a base sub-object
-    //
-    template <typename T>
-    inline const unsigned char * object_representation (T* p)
-    {
-        return static_cast<const unsigned char *>(static_cast<const void *>(p));
-    }
+    // Forward references
+    template <typename BlockInputIterator>
+    std::size_t initial_num_blocks(BlockInputIterator first,
+                                   BlockInputIterator last,
+                                   std::input_iterator_tag);
+    template <typename BlockForwardIterator>
+    std::size_t initial_num_blocks(BlockForwardIterator first,
+                                   BlockForwardIterator last,
+                                   std::forward_iterator_tag);
 
-    template<typename T, int amount, int width /* = default */>
-    struct shifter
-    {
-        static void left_shift(T & v) {
-            amount >= width ? (v = 0)
-                : (v >>= BOOST_DYNAMIC_BITSET_WRAP_CONSTANT(amount));
-        }
+    // The following 2 classes make sure that the bitset
+    // gets allocated in an exception safe manner
+    template <typename Allocator>
+    class dynamic_bitset_alloc_base {
+    public:
+      dynamic_bitset_alloc_base(const Allocator& alloc)
+        : m_alloc(alloc) { }
+    protected:
+      Allocator m_alloc;
     };
 
-    // ------- count function implementation --------------
 
-    typedef unsigned char byte_type;
-
-    // These two entities
-    //
-    //     enum mode { access_by_bytes, access_by_blocks };
-    //     template <mode> struct mode_to_type {};
-    //
-    // were removed, since the regression logs (as of 24 Aug 2008)
-    // showed that several compilers had troubles with recognizing
-    //
-    //   const mode m = access_by_bytes
-    //
-    // as a constant expression
-    //
-    // * So, we'll use bool, instead of enum *.
-    //
-    template <bool value>
-    struct value_to_type
+    template <typename Block, typename Allocator>
+    class dynamic_bitset_base :
+#ifdef BOOST_DYN_BITSET_USE_FRIENDS
+        protected
+#else
+        public
+#endif
+        dynamic_bitset_alloc_base<Allocator>
     {
-        value_to_type() {}
+      typedef std::size_t size_type;
+#ifndef BOOST_DYN_BITSET_USE_FRIENDS
+    public:
+#endif
+      enum { bits_per_block = CHAR_BIT * sizeof(Block) };
+    public:
+      dynamic_bitset_base()
+        : m_bits(0), m_num_bits(0), m_num_blocks(0) { }
+
+      dynamic_bitset_base(size_type num_bits, const Allocator& alloc)
+        : dynamic_bitset_alloc_base<Allocator>(alloc),
+          m_bits(dynamic_bitset_alloc_base<Allocator>::
+                 m_alloc.allocate(calc_num_blocks(num_bits), static_cast<void const *>(0))),
+          m_num_bits(num_bits),
+          m_num_blocks(calc_num_blocks(num_bits))
+      {
+        using namespace std;
+        memset(m_bits, 0, m_num_blocks * sizeof(Block)); // G.P.S. ask to Jeremy
+      }
+      ~dynamic_bitset_base() {
+        if (m_bits)
+          this->m_alloc.deallocate(m_bits, m_num_blocks);
+      }
+#ifdef BOOST_DYN_BITSET_USE_FRIENDS
+    protected:
+#endif
+      Block* m_bits;
+      size_type m_num_bits;
+      size_type m_num_blocks;
+
+      static size_type word(size_type bit)  { return bit / bits_per_block; } // [gps]
+      static size_type offset(size_type bit){ return bit % bits_per_block; } // [gps]
+      static Block mask1(size_type bit) { return Block(1) << offset(bit); }
+      static Block mask0(size_type bit) { return ~(Block(1) << offset(bit)); }
+      static size_type calc_num_blocks(size_type num_bits)
+        { return (num_bits + bits_per_block - 1) / bits_per_block; }
     };
-    const bool access_by_bytes = true;
-    const bool access_by_blocks = false;
+
+
+    // ------- count table implementation --------------
+
+    typedef unsigned char byte_t;
+
+    // only count<true> has a definition
+#if 0
+    // This was giving Intel C++ and Borland C++ trouble -JGS
+    template <bool = true> struct count;
+    template <> struct count <true> {
+#else
+    template <bool bogus = true>
+    struct count {
+#endif
+        typedef byte_t element_type;
+        static const byte_t table[];
+        BOOST_STATIC_CONSTANT (unsigned int, max_bit = 8); // must be a power of two
+
+    };
+    //typedef count<true> table_t;
 
 
     // the table: wrapped in a class template, so
     // that it is only instantiated if/when needed
     //
-    template <bool dummy_name = true>
-    struct count_table { static const byte_type table[]; };
-
-    template <>
-    struct count_table<false> { /* no table */ };
-
-
-     const unsigned int table_width = 8;
-     template <bool b>
-     const byte_type count_table<b>::table[] =
+#if 0
+      // Intel C++ and Borland C++ trouble -JGS
+     template <>
+     const byte_t count <true>::table[] =
+#else
+     template <bool bogus>
+     const byte_t count<bogus>::table[] =
+#endif
      {
        // Automatically generated by GPTableGen.exe v.1.0
        //
@@ -99,143 +138,39 @@ namespace boost {
      };
 
 
-     // overload for access by bytes
-     //
-
-     template <typename Iterator>
-     inline std::size_t do_count(Iterator first, std::size_t length,
-                                 int /*dummy param*/,
-                                 value_to_type<access_by_bytes>* )
-     {
-         std::size_t num = 0;
-         if (length)
-         {
-             const byte_type * p = object_representation(&*first);
-             length *= sizeof(*first);
-
-              do {
-                 num += count_table<>::table[*p];
-                 ++p;
-                 --length;
-
-             } while (length);
-         }
-
-         return num;
-     }
-
-
-     // overload for access by blocks
-     //
-     template <typename Iterator, typename ValueType>
-     inline std::size_t do_count(Iterator first, std::size_t length, ValueType,
-                                 value_to_type<access_by_blocks>*)
-     {
-         std::size_t num = 0;
-         while (length){
-
-             ValueType value = *first;
-             while (value) {
-                 num += count_table<>::table[value & ((1u<<table_width) - 1)];
-                 value >>= table_width;
-             }
-
-             ++first;
-             --length;
-         }
-
-         return num;
-     }
-
     // -------------------------------------------------------
 
-
-    // Some library implementations simply return a dummy
-    // value such as
-    //
-    //   size_type(-1) / sizeof(T)
-    //
-    // from vector<>::max_size. This tries to get more
-    // meaningful info.
-    //
-    template <typename T>
-    inline typename T::size_type vector_max_size_workaround(const T & v)
-        BOOST_NOEXCEPT
+    template <typename BlockInputIterator>
+    std::size_t initial_num_blocks(BlockInputIterator first,
+                   BlockInputIterator last,
+                   std::input_iterator_tag)
     {
-        typedef typename T::allocator_type allocator_type;
-
-        const allocator_type& alloc = v.get_allocator();
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-        typedef std::allocator_traits<allocator_type> allocator_traits;
-
-        const typename allocator_traits::size_type alloc_max =
-            allocator_traits::max_size(alloc);
-#else
-        const typename allocator_type::size_type alloc_max = alloc.max_size();
-#endif
-
-        const typename T::size_type container_max = v.max_size();
-
-        return alloc_max < container_max ? alloc_max : container_max;
+      return 0;
     }
 
-    // for static_asserts
-    template <typename T>
-    struct allowed_block_type {
-        enum { value = T(-1) > 0 }; // ensure T has no sign
-    };
+    template <typename BlockForwardIterator>
+    std::size_t initial_num_blocks(BlockForwardIterator first,
+                   BlockForwardIterator last,
+                   std::forward_iterator_tag)
+    {
+      std::size_t n = 0;
+      while (first != last)
+        ++first, ++n;
+      return n;
+    }
 
-    template <>
-    struct allowed_block_type<bool> {
-        enum { value = false };
-    };
+    template <typename BlockInputIterator>
+    std::size_t initial_num_blocks(BlockInputIterator first,
+                   BlockInputIterator last)
+    {
+      typename detail::iterator_traits<BlockInputIterator>::iterator_category cat;
+      return initial_num_blocks(first, last, cat);
+    }
 
 
-    template <typename T>
-    struct is_numeric {
-        enum { value = false };
-    };
-
-#   define BOOST_dynamic_bitset_is_numeric(x)       \
-                template<>                          \
-                struct is_numeric< x > {            \
-                    enum { value = true };          \
-                }                                /**/
-
-    BOOST_dynamic_bitset_is_numeric(bool);
-    BOOST_dynamic_bitset_is_numeric(char);
-
-#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
-    BOOST_dynamic_bitset_is_numeric(wchar_t);
-#endif
-
-    BOOST_dynamic_bitset_is_numeric(signed char);
-    BOOST_dynamic_bitset_is_numeric(short int);
-    BOOST_dynamic_bitset_is_numeric(int);
-    BOOST_dynamic_bitset_is_numeric(long int);
-
-    BOOST_dynamic_bitset_is_numeric(unsigned char);
-    BOOST_dynamic_bitset_is_numeric(unsigned short);
-    BOOST_dynamic_bitset_is_numeric(unsigned int);
-    BOOST_dynamic_bitset_is_numeric(unsigned long);
-
-#if defined(BOOST_HAS_LONG_LONG)
-    BOOST_dynamic_bitset_is_numeric(::boost::long_long_type);
-    BOOST_dynamic_bitset_is_numeric(::boost::ulong_long_type);
-#endif
-
-    // intentionally omitted
-    //BOOST_dynamic_bitset_is_numeric(float);
-    //BOOST_dynamic_bitset_is_numeric(double);
-    //BOOST_dynamic_bitset_is_numeric(long double);
-
-#undef BOOST_dynamic_bitset_is_numeric
-
-  } // dynamic_bitset_impl
   } // namespace detail
 
 } // namespace boost
 
-#endif // include guard
+#endif // BOOST_DETAIL_DYNAMIC_BITSET_HPP
 

include/boost/dynamic_bitset/config.hpp

@@ -1,72 +0,0 @@
-// -----------------------------------------------------------
-//
-//   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
-//        Copyright (c) 2003-2006, 2008 Gennaro Prota
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
-
-#ifndef BOOST_DYNAMIC_BITSET_CONFIG_HPP_GP_20040424
-#define BOOST_DYNAMIC_BITSET_CONFIG_HPP_GP_20040424
-
-#include "boost/config.hpp"
-#include "boost/detail/workaround.hpp"
-
-// support for pre 3.0 libstdc++ - thanks Phil Edwards!
-#if defined (__STL_CONFIG_H) && !defined (__STL_USE_NEW_IOSTREAMS)
-# define BOOST_OLD_IOSTREAMS
-#endif
-
-// no-op function to workaround gcc bug c++/8419
-//
-namespace boost { namespace detail {
-    template <typename T> T make_non_const(T t) { return t; }
-}}
-
-#if defined(__GNUC__)
-# define BOOST_DYNAMIC_BITSET_WRAP_CONSTANT(expr) \
-         (boost::detail::make_non_const(expr))
-#else
-# define BOOST_DYNAMIC_BITSET_WRAP_CONSTANT(expr) (expr)
-#endif
-
-//
-#if (defined __BORLANDC__ && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)))  \
-                             || (defined BOOST_NO_MEMBER_TEMPLATE_FRIENDS)
-#define BOOST_DYNAMIC_BITSET_DONT_USE_FRIENDS
-#endif
-
-// if we can't use friends then we simply expose private members
-//
-#if defined(BOOST_DYNAMIC_BITSET_DONT_USE_FRIENDS)
-#define BOOST_DYNAMIC_BITSET_PRIVATE public
-#else
-#define BOOST_DYNAMIC_BITSET_PRIVATE private
-#endif
-
-// A couple of macros to cope with libraries without locale
-// support. The first macro must be used to declare a reference
-// to a ctype facet. The second one to widen a char by using
-// that ctype object. If facets and locales aren't available
-// the first macro is a no-op and the second one just expands
-// to its parameter c.
-//
-#if defined (BOOST_USE_FACET)
-
-#define BOOST_DYNAMIC_BITSET_CTYPE_FACET(ch, name, loc)     \
-            const std::ctype<ch> & name =                   \
-            BOOST_USE_FACET(std::ctype<ch>, loc)         /**/
-
-#define BOOST_DYNAMIC_BITSET_WIDEN_CHAR(fac, c)             \
-           (fac.widen(c))
-#else
-
-#define BOOST_DYNAMIC_BITSET_CTYPE_FACET(ch, name, loc) /**/
-#define BOOST_DYNAMIC_BITSET_WIDEN_CHAR(fac, c)          c
-
-#endif
-
-#endif // include guard

include/boost/dynamic_bitset/serialization.hpp

@@ -1,46 +0,0 @@
-// -----------------------------------------------------------
-//
-// Copyright (c) 2015 Seth Heeren
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
-
-#ifndef BOOST_DYNAMIC_BITSET_SERIALIZATION_HPP
-#define BOOST_DYNAMIC_BITSET_SERIALIZATION_HPP
-
-#include "boost/dynamic_bitset/dynamic_bitset.hpp"
-#include <boost/serialization/vector.hpp>
-
-namespace boost {
-
-    // implementation for optional zero-copy serialization support
-    template <typename Block, typename Allocator>
-        class dynamic_bitset<Block, Allocator>::serialize_impl
-        {
-            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);
-                }
-        };
-
-}
-
-// ADL hook to Boost Serialization library
-namespace boost {
-    namespace serialization {
-
-        template <typename Ar, typename Block, typename Allocator>
-            void serialize(Ar& ar, dynamic_bitset<Block, Allocator>& bs, unsigned version) {
-                dynamic_bitset<Block, Allocator>::serialize_impl::serialize(ar, bs, version);
-            }
-
-    } // namespace serialization
-} // namespace boost
-
-#endif // include guard
-

include/boost/dynamic_bitset_fwd.hpp

@@ -1,13 +1,12 @@
-// -----------------------------------------------------------
+// (C) Copyright Chuck Allison and Jeremy Siek 2001, 2002.
 //
-//   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
-//            Copyright (c) 2003-2004 Gennaro Prota
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
+// Permission to copy, use, modify, sell and distribute this software
+// is granted provided this copyright notice appears in all
+// copies. This software is provided "as is" without express or
+// implied warranty, and with no claim as to its suitability for any
+// purpose.
+
+// See http://www.boost.org/libs/dynamic_bitset for documentation.
 
 #ifndef BOOST_DYNAMIC_BITSET_FWD_HPP
 #define BOOST_DYNAMIC_BITSET_FWD_HPP
@@ -20,6 +19,6 @@ template <typename Block = unsigned long,
           typename Allocator = std::allocator<Block> >
 class dynamic_bitset;
 
-}
+} // namespace boost
 
-#endif // include guard
+#endif // BOOST_DYNAMIC_BITSET_FWD_HPP

include/boost/pending/lowest_bit.hpp

@@ -1,39 +0,0 @@
-// -----------------------------------------------------------
-// lowest_bit.hpp
-//
-//           Position of the lowest bit 'on'
-//
-//         Copyright (c) 2003-2004, 2008 Gennaro Prota
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
-
-#ifndef BOOST_LOWEST_BIT_HPP_GP_20030301
-#define BOOST_LOWEST_BIT_HPP_GP_20030301
-
-#include <assert.h>
-#include "boost/pending/integer_log2.hpp"
-
-
-namespace boost {
-
-    template <typename T>
-    int lowest_bit(T x) {
-
-        assert(x >= 1); // PRE
-
-        // clear all bits on except the rightmost one,
-        // then calculate the logarithm base 2
-        //
-        return boost::integer_log2<T>( x - ( x & (x-1) ) );
-
-    }
-
-
-}
-
-
-#endif // include guard

index.html

@@ -1,15 +1,9 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<meta http-equiv=refresh content="0; URL=dynamic_bitset.html">
-<title>Automatic redirection</title>
+<meta http-equiv="refresh" content="0; URL=dynamic_bitset.html">
 </head>
 <body>
 Automatic redirection failed, please go to
-<a href="dynamic_bitset.html">dynamic_bitset.html</a>.&nbsp;<hr>
-<p>© Copyright Beman Dawes, 2001</p>
-<p>Distributed under the Boost Software License, Version 1.0. (See accompanying 
-file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy 
-at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
+<a href="dynamic_bitset.html">dynamic_bitset.html</a>.
 </body>
 </html>

meta/libraries.json

@@ -1,16 +0,0 @@
-{
-    "key": "dynamic_bitset",
-    "name": "Dynamic Bitset",
-    "authors": [
-        "Jeremy Siek",
-        "Chuck Allison"
-    ],
-    "description": "The dynamic_bitset class represents a set of bits. It provides accesses to the value of individual bits via an operator[] and provides all of the bitwise operators that one can apply to builtin integers, such as operator& and operator<<. The number of bits in the set is specified at runtime via a parameter to the constructor of the dynamic_bitset.",
-    "documentation": "dynamic_bitset.html",
-    "category": [
-        "Containers"
-    ],
-    "maintainers": [
-        "Jeremy Siek <jeremy.siek -at- gmail.com>"
-    ]
-}

test/Jamfile.v2

@@ -1,16 +0,0 @@
-#
-#              Copyright Vladimir Prus 2004
-#
-# Distributed under the Boost Software License, Version 1.0.
-#     (See accompanying file LICENSE_1_0.txt or copy at
-#           http://www.boost.org/LICENSE_1_0.txt)
-
-test-suite dynamic_bitset :
-
-    [ run dyn_bitset_unit_tests1.cpp ]
-    [ run dyn_bitset_unit_tests2.cpp ]
-    [ run dyn_bitset_unit_tests3.cpp ]
-    [ run dyn_bitset_unit_tests4.cpp ]
-    [ run dyn_bitset_unit_tests5.cpp /boost/serialization//boost_serialization
-       : : : <define>_SCL_SECURE_NO_WARNINGS=1 ]
-    ;

test/dyn_bitset_unit_tests1.cpp

@@ -1,534 +0,0 @@
-// -----------------------------------------------------------
-//              Copyright (c) 2001 Jeremy Siek
-//           Copyright (c) 2003-2006 Gennaro Prota
-//             Copyright (c) 2014 Ahmed Charles
-//            Copyright (c) 2014 Riccardo Marcangelo 
-//
-// Copyright (c) 2014 Glen Joseph Fernandes
-// glenfe at live dot com
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
-
-#include "bitset_test.hpp"
-#include "boost/dynamic_bitset/dynamic_bitset.hpp"
-#include "boost/limits.hpp"
-#include "boost/config.hpp"
-
-#include "boost/detail/workaround.hpp"
-
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-#include <cstdlib>
-
-template<class T>
-class minimal_allocator {
-public:
-    typedef T value_type;
-
-    minimal_allocator() {}
-
-    template <typename U>
-    minimal_allocator(const minimal_allocator<U>&) {}
-
-    T* allocate(std::size_t n) {
-        void* p = std::malloc(sizeof(T) * n);
-        if (!p) {
-            throw std::bad_alloc();
-        }
-        return static_cast<T*>(p);
-    }
-
-    void deallocate(T* p, std::size_t) {
-        std::free(p);
-    }
-};
-#endif
-
-#define BOOST_BITSET_TEST_COUNT(x) (sizeof(x)/sizeof(x[0]))
-
-
-// Codewarrior 8.3 for Win fails without this.
-// Thanks Howard Hinnant ;)
-#if defined __MWERKS__ && BOOST_WORKAROUND(__MWERKS__, <= 0x3003) // 8.x
-# pragma parse_func_templ off
-#endif
-
-
-template <typename Tests, typename String>
-void run_string_tests(const String& s
-                      BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tests)
-                     )
-{
-
-  const std::size_t len = s.length();
-  const std::size_t step = len/4 ? len/4 : 1;
-
-  // bitset length determined by the string-related arguments
-  std::size_t i;
-  for (i = 0; i <= len/2 ; i += step) {
-    Tests::from_string(s, i, len/2);     // len/2 - i bits
-    Tests::from_string(s, i, len);       // len - i   bits
-    Tests::from_string(s, i, 1 + len*2); // len - i   bits
-  }
-
-  // bitset length explicitly specified
-  for (i = 0; i <= len/2; i += step) {
-    for (std::size_t sz = 0; sz <= len*4; sz+= step*2) {
-      Tests::from_string(s, i, len/2, sz);
-      Tests::from_string(s, i, len,   sz);
-      Tests::from_string(s, i, 1 + len*2, sz);
-
-      }
-  }
-
-}
-
-// tests the do-the-right-thing constructor dispatch
-template <typename Tests, typename T>
-void run_numeric_ctor_tests( BOOST_EXPLICIT_TEMPLATE_TYPE(Tests)
-                             BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T) )
-{
-
-    const int bits_per_block = Tests::bits_per_block;
-    const int width = std::numeric_limits<T>::digits;
-    const T ma = (std::numeric_limits<T>::max)();
-    const T mi = (std::numeric_limits<T>::min)();
-
-    int sizes[] = {
-        0, 7*width/10,          width,          13*width/10,          3*width,
-           7*bits_per_block/10, bits_per_block, 13*bits_per_block/10, 3*bits_per_block
-    };
-
-    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)
-    };
-
-    for (std::size_t s = 0; s < BOOST_BITSET_TEST_COUNT(sizes); ++s) {
-      for (std::size_t n = 0; n < BOOST_BITSET_TEST_COUNT(numbers); ++n ) {
-
-          // can match ctor from ulong or templated one
-          Tests::from_unsigned_long(sizes[s], numbers[n]);
-
-          typedef std::size_t compare_type;
-          const compare_type sz = sizes[s];
-          // this condition is to be sure that size is representable in T, so
-          // that for signed T's we avoid implementation-defined behavior [if ma
-          // is larger than what std::size_t can hold then this is ok for our
-          // purposes: our sizes are anyhow < max(size_t)], which in turn could
-          // make the first argument of from_unsigned_long() a small negative,
-          // later converted to a very large unsigned. Example: signed 8-bit
-          // char (CHAR_MAX=127), bits_per_block=64, sz = 192 > 127.
-          const bool fits =
-              sz <= static_cast<compare_type>(ma);
-
-          if (fits) {
-            // can match templated ctor only (so we test dispatching)
-            Tests::from_unsigned_long(static_cast<T>(sizes[s]), numbers[n]);
-          }
-
-      }
-    }
-
-}
-
-
-template <typename Block>
-void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
-{
-  typedef boost::dynamic_bitset<Block> bitset_type;
-  typedef bitset_test<bitset_type> Tests;
-  const int bits_per_block = bitset_type::bits_per_block;
-
-  const std::string long_string = get_long_string();
-  const Block all_1s = static_cast<Block>(-1);
-
-  //=====================================================================
-  // Test construction from unsigned long
-  {
-    // NOTE:
-    //
-    // 1. keep this in sync with the numeric types supported
-    //    for constructor dispatch (of course)
-    // 2. bool is tested separately; ugly and inelegant, but
-    //    we don't have much time to think of a better solution
-    //    which is likely to work on broken compilers
-    //
-    const int sizes[] = {
-        0,                     1,                                  3,
-           7*bits_per_block/10, bits_per_block, 13*bits_per_block/10, 3*bits_per_block 
-    };
-    
-    const bool values[] = { false, true };
-
-    for (std::size_t s = 0; s < BOOST_BITSET_TEST_COUNT(sizes); ++s) {
-      for (std::size_t v = 0; v < BOOST_BITSET_TEST_COUNT(values); ++v) {
-          Tests::from_unsigned_long(sizes[s], values[v]);
-          Tests::from_unsigned_long(sizes[s] != 0, values[v]);
-      }
-    }
-
-    run_numeric_ctor_tests<Tests, char>();
-
-#if !defined(BOOST_NO_INTRINSIC_WCHAR_T)
-    run_numeric_ctor_tests<Tests, wchar_t>();
-#endif
-
-    run_numeric_ctor_tests<Tests, signed char>();
-    run_numeric_ctor_tests<Tests, short int>();
-    run_numeric_ctor_tests<Tests, int>();
-    run_numeric_ctor_tests<Tests, long int>();
-
-    run_numeric_ctor_tests<Tests, unsigned char>();
-    run_numeric_ctor_tests<Tests, unsigned short>();
-    run_numeric_ctor_tests<Tests, unsigned int>();
-    run_numeric_ctor_tests<Tests, unsigned long>();
-
-#if defined(BOOST_HAS_LONG_LONG)
-    run_numeric_ctor_tests<Tests, ::boost::long_long_type>();
-    run_numeric_ctor_tests<Tests, ::boost::ulong_long_type>();
-#endif
-
-  }
-  //=====================================================================
-  // Test construction from a string
-  {
-
-    run_string_tests<Tests>(std::string("")); // empty string
-    run_string_tests<Tests>(std::string("1"));
-
-    run_string_tests<Tests>(long_string);
-
-# if !defined BOOST_NO_STD_WSTRING
-    // I need to decide what to do for non "C" locales here. On
-    // one hand I should have better tests. On the other one
-    // I don't want tests for dynamic_bitset to cope with locales,
-    // ctype::widen, etc. (but that's what you deserve when you
-    // don't separate concerns at the library level)
-    //
-    run_string_tests<Tests>(
-        std::wstring(L"11111000000111111111010101010101010101010111111"));
-# endif
-
-    // Note that these are _valid_ arguments
-    Tests::from_string(std::string("x11y"), 1, 2);
-    Tests::from_string(std::string("x11"), 1, 10);
-    Tests::from_string(std::string("x11"), 1, 10, 10);
-
-  }
-  //=====================================================================
-  // test from_block_range
-  {
-    std::vector<Block> blocks;
-    Tests::from_block_range(blocks);
-  }
-  {
-    std::vector<Block> blocks(3);
-    blocks[0] = static_cast<Block>(0);
-    blocks[1] = static_cast<Block>(1);
-    blocks[2] = all_1s;
-    Tests::from_block_range(blocks);
-  }
-  {
-    const unsigned int n = (std::numeric_limits<unsigned char>::max)();
-    std::vector<Block> blocks(n);
-    for (typename std::vector<Block>::size_type i = 0; i < n; ++i)
-      blocks[i] = static_cast<Block>(i);
-    Tests::from_block_range(blocks);
-  }
-  //=====================================================================
-  // test to_block_range
-  {
-    bitset_type b;
-    Tests::to_block_range(b);
-  }
-  {
-    bitset_type b(1, 1ul);
-    Tests::to_block_range(b);
-  }
-  {
-    bitset_type b(long_string);
-    Tests::to_block_range(b);
-  }
-
-  //=====================================================================
-  // Test copy constructor
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::copy_constructor(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::copy_constructor(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::copy_constructor(b);
-  }
-  //=====================================================================
-  // Test copy assignment operator
-  {
-    bitset_type a, b;
-    Tests::copy_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(std::string("1")), b(std::string("0"));
-    Tests::copy_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(long_string), b(long_string);
-    Tests::copy_assignment_operator(a, b);
-  }
-  {
-    bitset_type a;
-    bitset_type b(long_string); // b greater than a, a empty
-    Tests::copy_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(std::string("0"));
-    bitset_type b(long_string); // b greater than a
-    Tests::copy_assignment_operator(a, b);
-  }
-
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-  //=====================================================================
-  // Test move constructor
-  {
-    boost::dynamic_bitset<Block> b;
-    Tests::move_constructor(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(std::string("0"));
-    Tests::move_constructor(b);
-  }
-  {
-    boost::dynamic_bitset<Block> b(long_string);
-    Tests::move_constructor(b);
-  }
-  //=====================================================================
-  // Test move assignment operator
-  {
-    bitset_type a, b;
-    Tests::move_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(std::string("1")), b(std::string("0"));
-    Tests::move_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(long_string), b(long_string);
-    Tests::move_assignment_operator(a, b);
-  }
-  {
-    bitset_type a;
-    bitset_type b(long_string); // b greater than a, a empty
-    Tests::move_assignment_operator(a, b);
-  }
-  {
-    bitset_type a(std::string("0"));
-    bitset_type b(long_string); // b greater than a
-    Tests::move_assignment_operator(a, b);
-  }
-#endif // BOOST_NO_CXX11_RVALUE_REFERENCES
-  //=====================================================================
-  // Test swap
-  {
-    bitset_type a;
-    bitset_type b(std::string("1"));
-    Tests::swap(a, b);
-    Tests::swap(b, a);
-    Tests::swap(a, a);
-  }
-  {
-    bitset_type a;
-    bitset_type b(long_string);
-    Tests::swap(a, b);
-    Tests::swap(b, a);
-  }
-  {
-    bitset_type a(std::string("0"));
-    bitset_type b(long_string);
-    Tests::swap(a, b);
-    Tests::swap(b, a);
-    Tests::swap(a, a);
-    Tests::swap(b, b);
-  }
-  //=====================================================================
-  // Test resize
-  {
-    boost::dynamic_bitset<Block> a;
-    Tests::resize(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("0"));
-    Tests::resize(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("1"));
-    Tests::resize(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(long_string);
-    Tests::resize(a);
-  }
-  //=====================================================================
-  // Test clear
-  {
-    boost::dynamic_bitset<Block> a;
-    Tests::clear(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(long_string);
-    Tests::clear(a);
-  }
-  //=====================================================================
-  // Test pop back 
-  {
-    boost::dynamic_bitset<Block> a(std::string("01"));
-    Tests::pop_back(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("10"));
-    Tests::pop_back(a);
-  }
-  {
-    const int size_to_fill_all_blocks = 4 * bits_per_block;
-    boost::dynamic_bitset<Block> a(size_to_fill_all_blocks, 255ul);
-    Tests::pop_back(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(long_string);
-    Tests::pop_back(a);
-  }
-  //=====================================================================
-  // Test append bit
-  {
-    boost::dynamic_bitset<Block> a;
-    Tests::append_bit(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("0"));
-    Tests::append_bit(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("1"));
-    Tests::append_bit(a);
-  }
-  {
-    const int size_to_fill_all_blocks = 4 * bits_per_block;
-    boost::dynamic_bitset<Block> a(size_to_fill_all_blocks, 255ul);
-    Tests::append_bit(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(long_string);
-    Tests::append_bit(a);
-  }
-  //=====================================================================
-  // Test append block
-  {
-    boost::dynamic_bitset<Block> a;
-    Tests::append_block(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("0"));
-    Tests::append_block(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("1"));
-    Tests::append_block(a);
-  }
-  {
-    const int size_to_fill_all_blocks = 4 * bits_per_block;
-    boost::dynamic_bitset<Block> a(size_to_fill_all_blocks, 15ul);
-    Tests::append_block(a);
-  }
-  {
-    boost::dynamic_bitset<Block> a(long_string);
-    Tests::append_block(a);
-  }
-  //=====================================================================
-  // Test append block range
-  {
-    boost::dynamic_bitset<Block> a;
-    std::vector<Block> blocks;
-    Tests::append_block_range(a, blocks);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("0"));
-    std::vector<Block> blocks(3);
-    blocks[0] = static_cast<Block>(0);
-    blocks[1] = static_cast<Block>(1);
-    blocks[2] = all_1s;
-    Tests::append_block_range(a, blocks);
-  }
-  {
-    boost::dynamic_bitset<Block> a(std::string("1"));
-    const unsigned int n = (std::numeric_limits<unsigned char>::max)();
-    std::vector<Block> blocks(n);
-    for (typename std::vector<Block>::size_type i = 0; i < n; ++i)
-      blocks[i] = static_cast<Block>(i);
-    Tests::append_block_range(a, blocks);
-  }
-  {
-    boost::dynamic_bitset<Block> a;
-    a.append(Block(1));
-    a.append(Block(2));
-    Block x[] = {3, 4, 5};
-    std::size_t sz = sizeof(x) / sizeof(x[0]);
-    std::vector<Block> blocks(x, x + sz);
-    Tests::append_block_range(a, blocks);
-  }
-  {
-    boost::dynamic_bitset<Block> a(long_string);
-    std::vector<Block> blocks(3);
-    blocks[0] = static_cast<Block>(0);
-    blocks[1] = static_cast<Block>(1);
-    blocks[2] = all_1s;
-    Tests::append_block_range(a, blocks);
-  }
-  //=====================================================================
-  // Test bracket operator
-  {
-    boost::dynamic_bitset<Block> b1;
-    std::vector<bool> bitvec1;
-    Tests::operator_bracket(b1, bitvec1);
-  }
-  {
-    boost::dynamic_bitset<Block> b(std::string("1"));
-    std::vector<bool> bit_vec(1, true);
-    Tests::operator_bracket(b, bit_vec);
-  }
-  {
-    boost::dynamic_bitset<Block> b(long_string);
-    std::size_t n = long_string.size();
-    std::vector<bool> bit_vec(n);
-    for (std::size_t i = 0; i < n; ++i)
-      bit_vec[i] = long_string[n - 1 - i] == '0' ? 0 : 1;
-    Tests::operator_bracket(b, bit_vec);
-  }
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
-  {
-     typedef boost::dynamic_bitset<Block,
-       minimal_allocator<Block> > Bitset;
-     Bitset b;
-     bitset_test<Bitset>::max_size(b);
-  }
-#endif
-}
-
-int
-test_main(int, char*[])
-{
-  run_test_cases<unsigned char>();
-  run_test_cases<unsigned short>();
-  run_test_cases<unsigned int>();
-  run_test_cases<unsigned long>();
-# ifdef BOOST_HAS_LONG_LONG
-  run_test_cases< ::boost::ulong_long_type>();
-# endif
-
-  return 0;
-}

test/dyn_bitset_unit_tests4.cpp

@@ -1,335 +0,0 @@
-// -----------------------------------------------------------
-//              Copyright (c) 2001 Jeremy Siek
-//           Copyright (c) 2003-2006 Gennaro Prota
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
-
-#include <fstream>
-#include <string>
-#include <cstddef>   // for std::size_t
-#include <stdexcept> // for std::logic_error
-#include <assert.h>
-
-#include "boost/config.hpp"
-#if !defined (BOOST_NO_STRINGSTREAM)
-# include <sstream>
-#endif
-
-#include "bitset_test.hpp"
-#include "boost/dynamic_bitset/dynamic_bitset.hpp"
-#include "boost/detail/workaround.hpp"
-
-
-// Codewarrior 8.3 for Win fails without this.
-// Thanks Howard Hinnant ;)
-#if defined __MWERKS__ && BOOST_WORKAROUND(__MWERKS__, <= 0x3003) // 8.x
-# pragma parse_func_templ off
-#endif
-
-
-#if defined BOOST_NO_STD_WSTRING || defined BOOST_NO_STD_LOCALE
-# define BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS
-#endif
-
-#if !defined BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS
-std::wstring widen_string( const std::string & str,
-                           const std::locale & loc = std::locale() )
-{
-  std::wstring result;
-  const std::string::size_type len = str.length();
-  if(len != 0) {
-
-    typedef std::ctype<wchar_t> ct_type;
-    typedef std::wstring::traits_type tr_type;
-    const ct_type & ct = BOOST_USE_FACET(ct_type, loc);
-
-    result.resize(len);
-    for (std::size_t i = 0; i < len; ++i)
-        tr_type::assign(result[i], ct.widen(str[i]));
-
-  }
-  return result;
-}
-#endif
-
-template <typename Block>
-void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
-{
-
-  typedef boost::dynamic_bitset<Block> bitset_type;
-  typedef bitset_test<bitset_type> Tests;
-
-  //=====================================================================
-  // Test stream operator<<
-  {
-
-    // The test "variables" are: the stream type and its state, the
-    // exception mask, the width, the fill char and the padding side (left/right)
-
-    std::ios::iostate masks[] = {
-                                  std::ios::goodbit,
-                                  std::ios::eofbit,
-                                  std::ios::failbit,
-                                  std::ios::eofbit | std::ios::failbit
-                                };
-
-    static std::string strings[] = {
-                                  std::string(""),
-                                  std::string("0"),
-                                  std::string("1"),
-                                  std::string("11100"),
-                                  get_long_string()
-                                };
-
-    char fill_chars[] =         { '*', 'x', ' ' };
-
-    std::size_t num_masks   = sizeof(masks) / sizeof(masks[0]);
-    std::size_t num_strings = sizeof(strings) / sizeof(strings[0]);
-    std::size_t num_chars   = sizeof(fill_chars) / sizeof(fill_chars[0]);
-
-    std::fstream not_good_stream("dynamic_bitset_tests - this file shouldn't exist",
-                                 std::ios::in);
-
-
-    for (std::size_t mi = 0; mi < num_masks; ++mi) {
-      for (std::size_t si = 0; si < num_strings; ++si) {
-
-        std::streamsize slen = (std::streamsize)(strings[si].length());
-
-        assert( (std::numeric_limits<std::streamsize>::max)()
-                 >=(std::streamsize)(1+slen*2) );
-
-        for (std::size_t ci = 0; ci < num_chars; ++ci) {
-
-          // note how "negative widths" are tested too
-          const std::streamsize widths[] = { -1 - slen/2, 0, slen/2, 1 + slen*2 };
-          std::size_t num_widths = sizeof(widths) / sizeof(widths[0]);
-
-          for (std::size_t wi = 0; wi < num_widths; ++wi) {
-            std::streamsize w = widths[wi];
-            {
-              // test 0 - stream !good()
-              if(not_good_stream.good())
-                  throw std::logic_error("Error in operator << tests"
-                                         " - please, double check");
-              bitset_type b(strings[si]);
-              not_good_stream.width(w);
-              not_good_stream.fill(fill_chars[ci]);
-              try { not_good_stream.exceptions(masks[mi]); } catch(...) {}
-
-              Tests::stream_inserter(b, not_good_stream, "<unused_string>");
-            }
-            {
-              // test 1a - file stream
-              bitset_type b(strings[si]);
-              std::ofstream file(test_file_name(), std::ios::trunc);
-              file.width(w);
-              file.fill(fill_chars[ci]);
-              file.exceptions(masks[mi]);
-              Tests::stream_inserter(b, file, test_file_name());
-
-            }
-            {
-              //NOTE: there are NO string stream tests
-            }
-#if !defined (BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS)
-            {
-              // test 1b - wide file stream
-              bitset_type b(strings[si]);
-              std::wofstream file(test_file_name());
-              file.width(w);
-              file.fill(fill_chars[ci]);
-              file.exceptions(masks[mi]);
-              Tests::stream_inserter(b, file, test_file_name());
-            }
-#endif
-          }
-        }
-      }
-    } // for (; mi..)
-
-  }
-
-  //=====================================================================
-  // Test stream operator>>
-  {
-
-  // The test "variables" are: the stream type, the exception mask,
-  // the actual contents (and/or state) of the stream, and width.
-  //
-  // With few exceptions, each test case consists of writing a different
-  // assortment of digits and "whitespaces" to a text stream and then checking
-  // that what was written gets read back unchanged. That's NOT guaranteed by
-  // the standard, unless the assortment always ends with a '\n' and satisfies
-  // other conditions (see C99, 7.19.2/2), however it works in practice and is
-  // a good "real life" test. Some characters, such as '\v' and '\f', are not
-  // used exactly because they are the ones which will most likely give problems
-  // on some systems (for instance '\f' could actually be written as a sequence
-  // of new-lines, and we could never be able to read it back)
-  //
-  // Note how the bitset object is not initially empty. That helps checking
-  // that it isn't erroneously clear()ed by operator>>.
-
-
-  std::ios::iostate masks[] = {
-                                  std::ios::goodbit,
-                                  std::ios::eofbit,
-                                  std::ios::failbit,
-                                  std::ios::eofbit | std::ios::failbit
-                                   };
-
-  const std::string spaces = "\t\n "; //"\t\n\v\f ";
-
-  const std::string long_string = get_long_string();
-  /*const*/ static std::string strings[] = {
-                  // NOTE: "const" gives the usual problems with Borland
-                  //       (in Tests::stream_extractor instantiation)
-
-
-#if !(defined __BORLANDC__     \
-      && BOOST_WORKAROUND(BOOST_RWSTD_VER, BOOST_TESTED_AT(0x20101)))
-                                        // Borland 5.5.1 with RW library crashes
-            // empty string
-            std::string(""),
-            // no bitset
-            spaces,
-#endif
-            // no bitset
-            std::string("x"),
-            std::string("\t  xyz"),
-
-            // bitset of size 1
-            std::string("0"),
-            std::string("1"),
-
-            std::string("  0  "),
-            std::string("  1  "),
-            spaces + "1",
-            "1" + spaces,
-            spaces + "1" + spaces,
-            std::string("  x1x  "),
-            std::string("  1x  "),
-
-            // long bitset
-            long_string,
-            "  " + long_string + " xyz",
-            spaces + long_string,
-            spaces + long_string + spaces
-    };
-
-
-  //-----------------------------------------------------
-
-  std::stringstream not_good_stream;
-  not_good_stream << "test";
-  std::string sink;
-  not_good_stream >> sink; // now the stream should be in eof state
-
-  const std::size_t num_masks = sizeof(masks) / sizeof(masks[0]);
-  const std::size_t num_strings = sizeof(strings) / sizeof(strings[0]);
-
-  for (std::size_t mi = 0; mi < num_masks; ++mi) {
-    for (std::size_t si = 0; si < num_strings; ++si) {
-
-      const std::streamsize slen = (std::streamsize)(strings[si].length());
-      assert((std::numeric_limits<std::streamsize>::max)() >= (std::streamsize)(1+slen*2));
-
-      std::streamsize widths[] = { -1, 0, slen/2, slen, 1 + slen*2 };
-      std::size_t num_widths = sizeof(widths) / sizeof(widths[0]);
-
-      for(std::size_t wi = 0; wi < num_widths; ++wi) {
-        const std::streamsize w = widths[wi];
-
-        // test 0 - !good() stream
-        {
-          if(not_good_stream.good())
-            throw std::logic_error("Error in operator >> tests"
-                                   " - please, double check");
-          bitset_type b(1, 15ul); // note: b is not empty
-          not_good_stream.width(w);
-          try { not_good_stream.exceptions(masks[mi]); } catch(...) {}
-          std::string irrelevant;
-          Tests::stream_extractor(b, not_good_stream, irrelevant);
-        }
-        // test 1a - (narrow) file stream
-        {
-          bitset_type b(1, 255ul);
-          {
-            std::ofstream f(test_file_name());
-            f << strings[si];
-          }
-
-          std::ifstream f(test_file_name());
-          f.width(w);
-          f.exceptions(masks[mi]);
-          Tests::stream_extractor(b, f, strings[si]);
-        }
-#if !defined(BOOST_NO_STRINGSTREAM)
-        // test 2a - stringstream
-        {
-          bitset_type b(1, 255ul);
-          std::istringstream stream(strings[si]);
-          stream.width(w);
-          stream.exceptions(masks[mi]);
-          Tests::stream_extractor(b, stream, strings[si]);
-        }
-#endif
-
-#if !defined(BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS)
-        // test 1b - wchar_t file stream
-        {
-          std::wstring wstr = widen_string(strings[si]);
-          bitset_type b(1, 255ul);
-          {
-            std::basic_ofstream<wchar_t> of(test_file_name());
-            of << wstr;
-          }
-
-          std::basic_ifstream<wchar_t> f(test_file_name());
-          f.width(w);
-          f.exceptions(masks[mi]);
-          Tests::stream_extractor(b, f, wstr);
-        }
-        // test 2b - wstringstream
-        {
-          bitset_type b(1, 255ul);
-          std::wstring wstr = widen_string(strings[si]);
-
-          std::wistringstream wstream(wstr);
-          wstream.width(w);
-          wstream.exceptions(masks[mi]);
-          Tests::stream_extractor(b, wstream, wstr);
-        }
-#endif // BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS
-
-      }
-    }
-
-  } // for ( mi = 0; ...)
-
-
-  }
-  //=====================================================================
-  // << Any other tests go here >>
-  //         .....
-
-}
-
-
-int
-test_main(int, char*[])
-{
-  run_test_cases<unsigned char>();
-  run_test_cases<unsigned short>();
-  run_test_cases<unsigned int>();
-  run_test_cases<unsigned long>();
-# ifdef BOOST_HAS_LONG_LONG
-  run_test_cases< ::boost::ulong_long_type>();
-# endif
-
-  return 0;
-}

test/dyn_bitset_unit_tests5.cpp

@@ -1,111 +0,0 @@
-// -----------------------------------------------------------
-//              Copyright (c) 2001 Jeremy Siek
-//           Copyright (c) 2003-2006 Gennaro Prota
-//
-// Copyright (c) 2015 Seth Heeren
-//
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-//
-// -----------------------------------------------------------
-
-#include "boost/config.hpp"
-#if !defined (BOOST_NO_STRINGSTREAM)
-# include <sstream>
-#endif
-
-#include "bitset_test.hpp"
-#include "boost/dynamic_bitset/serialization.hpp"
-#include "boost/detail/workaround.hpp"
-
-
-// Codewarrior 8.3 for Win fails without this.
-// Thanks Howard Hinnant ;)
-#if defined __MWERKS__ && BOOST_WORKAROUND(__MWERKS__, <= 0x3003) // 8.x
-# pragma parse_func_templ off
-#endif
-
-
-#if defined BOOST_NO_STD_WSTRING || defined BOOST_NO_STD_LOCALE
-# define BOOST_DYNAMIC_BITSET_NO_WCHAR_T_TESTS
-#endif
-
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/archive/xml_iarchive.hpp>
-#include <sstream>
-
-namespace {
-    template <typename Block>
-        struct SerializableType {
-            boost::dynamic_bitset<Block> x;
-
-          private:
-            friend class boost::serialization::access;
-            template <class Archive> void serialize(Archive &ar, const unsigned int) {
-                ar & BOOST_SERIALIZATION_NVP(x);
-            }
-        };
-
-    template <typename Block, typename IArchive, typename OArchive>
-        void test_serialization( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
-        {
-            SerializableType<Block> a;
-
-            for (int i=0; i<128; ++i)
-                a.x.resize(11*i, i%2);
-
-#if !defined (BOOST_NO_STRINGSTREAM)
-            std::stringstream ss;
-
-            // test serialization
-            {
-                OArchive oa(ss);
-                oa << BOOST_SERIALIZATION_NVP(a);
-            }
-
-            // test de-serialization
-            {
-                IArchive ia(ss);
-                SerializableType<Block> b;
-                ia >> BOOST_SERIALIZATION_NVP(b);
-
-                assert(a.x == b.x);
-            }
-#else
-#           error "TODO implement file-based test path?"
-#endif
-        }
-
-    template <typename Block>
-        void test_binary_archive( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) ) {
-            test_serialization<Block, boost::archive::binary_iarchive, boost::archive::binary_oarchive>();
-        }
-
-    template <typename Block>
-        void test_xml_archive( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) ) {
-            test_serialization<Block, boost::archive::xml_iarchive, boost::archive::xml_oarchive>();
-        }
-}
-
-template <typename Block>
-void run_test_cases( BOOST_EXPLICIT_TEMPLATE_TYPE(Block) )
-{
-    test_binary_archive<Block>();
-    test_xml_archive<Block>();
-}
-
-int test_main(int, char*[])
-{
-    run_test_cases<unsigned char>();
-    run_test_cases<unsigned short>();
-    run_test_cases<unsigned int>();
-    run_test_cases<unsigned long>();
-# ifdef BOOST_HAS_LONG_LONG
-    run_test_cases< ::boost::ulong_long_type>();
-# endif
-
-    return 0;
-}

timing_tests.cpp

@@ -0,0 +1,101 @@
+//  boost::dynamic_bitset timing test ---------------------------------------//
+
+//  (C) Copyright Gennaro Prota 2002.
+//      Permission to copy, use, modify, sell and distribute this software
+//      is granted provided this copyright notice appears in all copies.
+//      This software is provided "as is" without express or implied warranty,
+//      and with no claim as to its suitability for any purpose.
+
+
+
+//****************************************************************************//
+
+//  WARNING:
+//  ~~~~~~~
+//   This is a preliminary version, for internal testing only.
+//   For now, it stresses the count() function only and has been executed
+//   on a very few platforms. The previous version, for instance, was never
+//   executed on MSVC (boost::bitset<> didn't even compile with it) and at
+//   the first try it crashed at startup, presumably because of a linker bug.
+//   To cope with it, the definition of
+//
+//      template <typename T> void timing_test()
+//
+//   has been moved before the definition of main()
+//
+//   LAST MODIFIED: 2 Aug 2002
+//****************************************************************************//
+
+
+
+#include <iostream>
+#include <typeinfo>
+#include <iomanip>
+
+#include "boost/timer.hpp"
+#include "boost/dynamic_bitset.hpp"
+#include "boost/cstdlib.hpp"
+
+
+
+void prologue()
+{
+    std::cout << "Compiler: " << BOOST_COMPILER << '\n';
+    std::cout << "STLPort used? ";
+#  ifdef _STLPORT_VERSION
+    std::cout << "Yes, v." << std::hex << _STLPORT_VERSION;
+#  else
+    std::cout << "No.";
+#  endif
+    std::cout << std::dec << "\n";
+}
+
+
+
+
+
+template <typename T>
+void timing_test()
+{
+    const unsigned long num = 10000;
+    
+    std::size_t dummy = 0; // this is printed at the end of the test,
+                           // to prevent the optimizer to eliminate
+                           // the call to count() in the loop below :-)
+
+
+    std::cout << "\n\nTimings for dynamic_bitset<" << typeid(T).name()
+              << ">  [" << num << " iterations]\n";
+    std::cout << "--------------------------------------------------\n";
+
+    { // new implementation
+        boost::timer time;
+        
+        for (unsigned long i=0; i<num; ++i) {
+            boost::dynamic_bitset<T> bs(std::size_t(5000), i);
+            dummy += bs.count();
+        }
+        const double elaps = time.elapsed();
+        std::cout << "Elapsed: " << elaps << '\n';
+    }
+
+    std::cout << "(total count: " << dummy << ")\n";
+}
+
+
+
+int main()
+{
+
+    prologue();
+
+    timing_test<unsigned short>();
+    timing_test<unsigned int>();
+    timing_test<unsigned long>();
+# ifdef BOOST_HAS_LONG_LONG
+    timing_test<unsigned long long>();
+# endif
+    
+    return boost::exit_success;
+}
+