[Boost-commit] svn:boost r48252 - in trunk/boost: . dynamic_bitset

From: gennaro.prota_at_[hidden]
Date: 2008-08-20 07:16:16

Author: gennaro_prota
Date: 2008-08-20 07:16:16 EDT (Wed, 20 Aug 2008)
New Revision: 48252
URL: http://svn.boost.org/trac/boost/changeset/48252

Log:
dynamic_bitset:

    * clean up and fix of copyright notices for the include files that are directly under boost/
    * parenthesized a couple of macro names in boost/dynamic_bitset/config.hpp
      (yeah, a bit paranoid, I know :-))
    * removed some superfluous comments and enclosed an url in angle brackets
    * changed block_width_type, to avoid a few level 4 warnings with MSVC++
    * added the usual private-and-non-implemented copy members to bit_appender
    * removed useless #pragma warning(disable:4996) for MSVC++ (it should have
      been eventually applied to much more places than it was; and, anyhow, the
      only sensible way to get rid of the warning is to disable it globally)
    * slight tweak in to_ulong (assert moved a bit earlier)

Text files modified: 
   trunk/boost/dynamic_bitset.hpp                |    10 ++------                                
   trunk/boost/dynamic_bitset/config.hpp         |     6 ++--                                    
   trunk/boost/dynamic_bitset/dynamic_bitset.hpp |    41 ++++++++++++++------------------------- 
   trunk/boost/dynamic_bitset_fwd.hpp            |    12 +++-------                              
   4 files changed, 25 insertions(+), 44 deletions(-)

Modified: trunk/boost/dynamic_bitset.hpp
==============================================================================
--- trunk/boost/dynamic_bitset.hpp	(original)
+++ trunk/boost/dynamic_bitset.hpp	2008-08-20 07:16:16 EDT (Wed, 20 Aug 2008)
@@ -1,7 +1,7 @@
-// --------------------------------------------------
+// -----------------------------------------------------------
 //
-// (C) Copyright Chuck Allison and Jeremy Siek 2001 - 2002.
-// (C) Copyright Gennaro Prota                 2003 - 2004.
+//   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
+//        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
@@ -9,10 +9,6 @@
 //
 // -----------------------------------------------------------
 
-//  See http://www.boost.org/libs/dynamic_bitset/ for documentation.
-//
-//  $Revision$ $Date$ - $Name$
-
 #ifndef BOOST_DYNAMIC_BITSET_HPP
 #define BOOST_DYNAMIC_BITSET_HPP
 

Modified: trunk/boost/dynamic_bitset/config.hpp
==============================================================================
--- trunk/boost/dynamic_bitset/config.hpp	(original)
+++ trunk/boost/dynamic_bitset/config.hpp	2008-08-20 07:16:16 EDT (Wed, 20 Aug 2008)
@@ -1,7 +1,7 @@
 // -----------------------------------------------------------
 //
 //   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
-//           Copyright (c) 2003-2006 Gennaro Prota
+//        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
@@ -22,8 +22,8 @@
 
 // this should be in the config system some day
 // see http://lists.boost.org/MailArchives/boost/msg62291.php
-#define BOOST_DYNAMIC_BITSET_GNUC_VERSION  (  __GNUC__       * 100 * 100     \
-                                            + __GNUC_MINOR__ * 100)
+#define BOOST_DYNAMIC_BITSET_GNUC_VERSION  (  (__GNUC__)       * 100 * 100     \
+                                            + (__GNUC_MINOR__) * 100)
 
 // no-op function to workaround gcc bug c++/8419
 //

Modified: trunk/boost/dynamic_bitset/dynamic_bitset.hpp
==============================================================================
--- trunk/boost/dynamic_bitset/dynamic_bitset.hpp	(original)
+++ trunk/boost/dynamic_bitset/dynamic_bitset.hpp	2008-08-20 07:16:16 EDT (Wed, 20 Aug 2008)
@@ -1,7 +1,7 @@
 // -----------------------------------------------------------
 //
 //   Copyright (c) 2001-2002 Chuck Allison and Jeremy Siek
-//           Copyright (c) 2003-2006 Gennaro Prota
+//        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
@@ -14,8 +14,8 @@
 
 #include <assert.h>
 #include <string>
-#include <stdexcept>    // for std::overflow_error
-#include <algorithm>    // for std::swap, min, copy, fill
+#include <stdexcept>
+#include <algorithm>
 #include <vector>
 #include <climits>      // for CHAR_BIT
 
@@ -38,7 +38,7 @@
 #include "boost/detail/iterator.hpp" // used to implement append(Iter, Iter)
 #include "boost/static_assert.hpp"
 #include "boost/limits.hpp"
-#include "boost/pending/lowest_bit.hpp" // used by find_first/next
+#include "boost/pending/lowest_bit.hpp"
 
 
 namespace boost {
@@ -64,7 +64,7 @@
     typedef Block block_type;
     typedef Allocator allocator_type;
     typedef std::size_t size_type;
-    typedef int block_width_type;
+    typedef block_type block_width_type;
 
     BOOST_STATIC_CONSTANT(block_width_type, bits_per_block = (std::numeric_limits<Block>::digits));
     BOOST_STATIC_CONSTANT(size_type, npos = static_cast<size_type>(-1));
@@ -80,7 +80,7 @@
 
 
         // the one and only non-copy ctor
-        reference(block_type & b, int pos)
+        reference(block_type & b, block_type pos)
             :m_block(b), m_mask(block_type(1) << pos)
         { assert(pos >= 0 && pos < bits_per_block); }
 
@@ -311,7 +311,7 @@
 
     block_width_type count_extra_bits() const { return bit_index(size()); }
     static size_type block_index(size_type pos) { return pos / bits_per_block; }
-    static block_width_type bit_index(size_type pos) { return static_cast<int>(pos % bits_per_block); }
+    static block_width_type bit_index(size_type pos) { return static_cast<block_width_type>(pos % bits_per_block); }
     static Block bit_mask(size_type pos) { return Block(1) << bit_index(pos); }
 
     template <typename CharT, typename Traits, typename Alloc>
@@ -378,6 +378,11 @@
       size_type n;
       Block mask;
       Block * current;
+
+      // not implemented
+      bit_appender(const bit_appender &);
+      bit_appender & operator=(const bit_appender &);
+
     public:
         bit_appender(dynamic_bitset & r) : bs(r), n(0), mask(0), current(0) {}
         ~bit_appender() {
@@ -417,7 +422,7 @@
 //
 // NOTE:
 //  The compiler is actually right, until core issue 454 will be settled:
-//   http://www.open-std.org/JTC1/SC22/WG21/docs/cwg_active.html#454
+//   <http://www.open-std.org/JTC1/SC22/WG21/docs/cwg_active.html#454>
 //
 //  It's arguable whether we want to mark this with BOOST_WORKAROUND or not.
 
@@ -764,27 +769,12 @@
             b[div] = b[0];
         }
 
-    // disable std::fill_n deprecated warning in MSVC++ 8.0 (warning C4996)
-    // This will only work in MSVC++ 8.0 SP1, which brings up the warning
-    // in the line of user code; otherwise, the warning will come up
-    // in the line in the header itself, so if the user includes stdlib
-    // headers before dynamic_bitset, he will still get the warning.
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#pragma warning(push)
-#pragma warning(disable:4996)
-#endif
-
         // zero out div blocks at the less significant end
         std::fill_n(b, div, static_cast<block_type>(0));
 
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-#pragma warning(pop)
-#endif
-
         // zero out any 1 bit that flowed into the unused part
         m_zero_unused_bits(); // thanks to Lester Gong
 
-
     }
 
     return *this;
@@ -1072,12 +1062,11 @@
 
   const size_type last_block = block_index( max_size - 1 );
 
+  assert((last_block * bits_per_block) < static_cast<size_type>(ulong_width));
+
   result_type result = 0;
   for (size_type i = 0; i <= last_block; ++i) {
-
     const size_type offset = i * bits_per_block;
-    assert( offset < static_cast<size_type>(ulong_width));
-
     result |= (static_cast<result_type>(m_bits[i]) << offset);
   }
 

Modified: trunk/boost/dynamic_bitset_fwd.hpp
==============================================================================
--- trunk/boost/dynamic_bitset_fwd.hpp	(original)
+++ trunk/boost/dynamic_bitset_fwd.hpp	2008-08-20 07:16:16 EDT (Wed, 20 Aug 2008)
@@ -1,7 +1,7 @@
-// --------------------------------------------------
+// -----------------------------------------------------------
 //
-// (C) Copyright Chuck Allison and Jeremy Siek 2001 - 2002.
-// (C) Copyright Gennaro Prota                 2003 - 2004.
+//   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
@@ -9,10 +9,6 @@
 //
 // -----------------------------------------------------------
 
-//  See http://www.boost.org/libs/dynamic_bitset/ for documentation.
-//
-//  $Revision$ $Date$ - $Name$
-
 #ifndef BOOST_DYNAMIC_BITSET_FWD_HPP
 #define BOOST_DYNAMIC_BITSET_FWD_HPP
 
@@ -24,6 +20,6 @@
           typename Allocator = std::allocator<Block> >
 class dynamic_bitset;
 
-} // namespace boost
+}
 
 #endif // include guard