[Boost-commit] svn:boost r50470 - branches/release/boost/dynamic_bitset

Subject: [Boost-commit] svn:boost r50470 - branches/release/boost/dynamic_bitset
From: gennaro.prota_at_[hidden]
Date: 2009-01-04 18:03:29

Author: gennaro_prota
Date: 2009-01-04 18:03:28 EST (Sun, 04 Jan 2009)
New Revision: 50470
URL: http://svn.boost.org/trac/boost/changeset/50470

Log:
dynamic_bitset: ported revisions 49433, 49586 from trunk
Text files modified: 
   branches/release/boost/dynamic_bitset/config.hpp         |     8 +-------                                
   branches/release/boost/dynamic_bitset/dynamic_bitset.hpp |    24 +++++++++---------------                
   2 files changed, 10 insertions(+), 22 deletions(-)

Modified: branches/release/boost/dynamic_bitset/config.hpp
==============================================================================
--- branches/release/boost/dynamic_bitset/config.hpp	(original)
+++ branches/release/boost/dynamic_bitset/config.hpp	2009-01-04 18:03:28 EST (Sun, 04 Jan 2009)
@@ -20,19 +20,13 @@
 # define BOOST_OLD_IOSTREAMS
 #endif
 
-// 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)
-
 // 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__) && BOOST_WORKAROUND(BOOST_DYNAMIC_BITSET_GNUC_VERSION, \
-                                          BOOST_TESTED_AT(30300))
+#if defined(__GNUC__)
 # define BOOST_DYNAMIC_BITSET_WRAP_CONSTANT(expr) \
          (boost::detail::make_non_const(expr))
 #else

Modified: branches/release/boost/dynamic_bitset/dynamic_bitset.hpp
==============================================================================
--- branches/release/boost/dynamic_bitset/dynamic_bitset.hpp	(original)
+++ branches/release/boost/dynamic_bitset/dynamic_bitset.hpp	2009-01-04 18:03:28 EST (Sun, 04 Jan 2009)
@@ -476,24 +476,18 @@
 
 };
 
-#if defined(__IBMCPP__) && BOOST_WORKAROUND(__IBMCPP__, BOOST_TESTED_AT(600))
+#if !defined BOOST_NO_INCLASS_MEMBER_INITIALIZATION
 
-// Workaround for IBM's AIX platform.
-// See http://comments.gmane.org/gmane.comp.lib.boost.user/15331
-//
-// 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>
-//
-//  It's arguable whether we want to mark this with BOOST_WORKAROUND or not.
-
-
-template<typename Block, typename Allocator>
-dynamic_bitset<Block, Allocator>::block_width_type const
+template <typename Block, typename Allocator>
+const typename dynamic_bitset<Block, Allocator>::block_width_type
 dynamic_bitset<Block, Allocator>::bits_per_block;
 
-template<typename Block, typename Allocator>
-dynamic_bitset<Block, Allocator>::block_width_type const
+template <typename Block, typename Allocator>
+const typename dynamic_bitset<Block, Allocator>::size_type
+dynamic_bitset<Block, Allocator>::npos;
+
+template <typename Block, typename Allocator>
+const typename dynamic_bitset<Block, Allocator>::block_width_type
 dynamic_bitset<Block, Allocator>::ulong_width;
 
 #endif