[Boost-commit] svn:boost r57152 - in trunk: boost/unordered/detail libs/unordered/test/unordered

Subject: [Boost-commit] svn:boost r57152 - in trunk: boost/unordered/detail libs/unordered/test/unordered
From: daniel_james_at_[hidden]
Date: 2009-10-25 06:55:09

Author: danieljames
Date: 2009-10-25 06:55:08 EDT (Sun, 25 Oct 2009)
New Revision: 57152
URL: http://svn.boost.org/trac/boost/changeset/57152

Log:
Slightly rearrange the unordered container headers so that prev_prime is defined before it's used.
Text files modified: 
   trunk/boost/unordered/detail/buckets.hpp       |     7 +++++++                                 
   trunk/boost/unordered/detail/fwd.hpp           |     5 +----                                   
   trunk/boost/unordered/detail/table.hpp         |     1 -                                       
   trunk/libs/unordered/test/unordered/Jamfile.v2 |     2 +-                                      
   4 files changed, 9 insertions(+), 6 deletions(-)

Modified: trunk/boost/unordered/detail/buckets.hpp
==============================================================================
--- trunk/boost/unordered/detail/buckets.hpp	(original)
+++ trunk/boost/unordered/detail/buckets.hpp	2009-10-25 06:55:08 EDT (Sun, 25 Oct 2009)
@@ -10,6 +10,7 @@
 #include <boost/config.hpp>
 #include <boost/assert.hpp>
 #include <boost/unordered/detail/node.hpp>
+#include <boost/unordered/detail/util.hpp>
 
 namespace boost { namespace unordered_detail {
     
@@ -17,6 +18,12 @@
     // Buckets
     
     template <class A, class G>
+    inline std::size_t hash_buckets<A, G>::max_bucket_count() const {
+        // -1 to account for the sentinel.
+        return prev_prime(this->bucket_alloc().max_size() - 1);
+    }
+
+    template <class A, class G>
     inline BOOST_DEDUCED_TYPENAME hash_buckets<A, G>::bucket_ptr
         hash_buckets<A, G>::get_bucket(std::size_t num) const
     {

Modified: trunk/boost/unordered/detail/fwd.hpp
==============================================================================
--- trunk/boost/unordered/detail/fwd.hpp	(original)
+++ trunk/boost/unordered/detail/fwd.hpp	2009-10-25 06:55:08 EDT (Sun, 25 Oct 2009)
@@ -298,10 +298,7 @@
             return allocators_.first(); }
         node_allocator& node_alloc() {
             return allocators_.second(); }
-        std::size_t max_bucket_count() const {
-            // -1 to account for the sentinel.
-            return prev_prime(this->bucket_alloc().max_size() - 1);
-        }
+        std::size_t max_bucket_count() const;
 
         // Constructors
 

Modified: trunk/boost/unordered/detail/table.hpp
==============================================================================
--- trunk/boost/unordered/detail/table.hpp	(original)
+++ trunk/boost/unordered/detail/table.hpp	2009-10-25 06:55:08 EDT (Sun, 25 Oct 2009)
@@ -14,7 +14,6 @@
 #include <boost/iterator/iterator_categories.hpp>
 
 #include <boost/unordered/detail/buckets.hpp>
-#include <boost/unordered/detail/util.hpp>
 
 namespace boost { namespace unordered_detail {
 

Modified: trunk/libs/unordered/test/unordered/Jamfile.v2
==============================================================================
--- trunk/libs/unordered/test/unordered/Jamfile.v2	(original)
+++ trunk/libs/unordered/test/unordered/Jamfile.v2	2009-10-25 06:55:08 EDT (Sun, 25 Oct 2009)
@@ -11,7 +11,7 @@
         <toolset>intel:<warnings>on
         <toolset>intel:<cxxflags>-strict-ansi
         <toolset>msvc:<cxxflags>/W4
-        <toolset>gcc:<cxxflags>"-Wsign-promo -Wunused-parameter"
+        <toolset>gcc:<cxxflags>"-Wsign-promo -Wunused-parameter -pedantic"
     ;
 
 test-suite unordered