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

Subject: [Boost-commit] svn:boost r72331 - branches/release/boost/dynamic_bitset
From: marshall_at_[hidden]
Date: 2011-06-01 11:59:04

Author: marshall
Date: 2011-06-01 11:59:04 EDT (Wed, 01 Jun 2011)
New Revision: 72331
URL: http://svn.boost.org/trac/boost/changeset/72331

Log:
Merge fixes to release; Fixes #5439
Properties modified: 
   branches/release/boost/dynamic_bitset/dynamic_bitset.hpp   (contents, props changed)
Text files modified: 
   branches/release/boost/dynamic_bitset/dynamic_bitset.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

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	2011-06-01 11:59:04 EDT (Wed, 01 Jun 2011)
@@ -1108,10 +1108,10 @@
   // beyond the "allowed" positions
   typedef unsigned long result_type;
 
-  const size_type max_size =
+  const size_type maximum_size =
             (std::min)(m_num_bits, static_cast<size_type>(ulong_width));
 
-  const size_type last_block = block_index( max_size - 1 );
+  const size_type last_block = block_index( maximum_size - 1 );
 
   assert((last_block * bits_per_block) < static_cast<size_type>(ulong_width));