[Boost-commit] svn:boost r53043 - in branches/release: . boost/unordered/detail

Subject: [Boost-commit] svn:boost r53043 - in branches/release: . boost/unordered/detail
From: daniel_james_at_[hidden]
Date: 2009-05-16 09:38:39

Author: danieljames
Date: 2009-05-16 09:38:37 EDT (Sat, 16 May 2009)
New Revision: 53043
URL: http://svn.boost.org/trac/boost/changeset/53043

Log:
Long term fix for the incorrect length of prime list.

Merged revisions 52658,52669,52673,52711 via svnmerge from 
https://svn.boost.org/svn/boost/trunk

........
  r52658 | danieljames | 2009-04-29 11:05:17 +0100 (Wed, 29 Apr 2009) | 1 line
  
  Fix the length of the prime number list.
........
  r52669 | danieljames | 2009-04-29 22:43:41 +0100 (Wed, 29 Apr 2009) | 3 lines
  
  Don't test prime_list::length on Visual C++.
  
  Checking the array size doesn't seem to work on it.
........
  r52673 | danieljames | 2009-04-30 06:08:40 +0100 (Thu, 30 Apr 2009) | 1 line
  
  Revert changes to unordered, as the test fails on most compilers.
........
  r52711 | danieljames | 2009-05-01 21:50:32 +0100 (Fri, 01 May 2009) | 5 lines
  
  Use a preprocessor sequence for the primes.
  
  This feels like overkill but it seems to be the most reliable way to ensure
  that the length is correct. I obviously can't be trusted to get it right, and
  the template hack seems to prevent Boost.Range from working.
........

Properties modified: 
   branches/release/   (props changed)
Text files modified: 
   branches/release/boost/unordered/detail/hash_table.hpp |    25 +++++++++++++++++--------               
   1 files changed, 17 insertions(+), 8 deletions(-)

Modified: branches/release/boost/unordered/detail/hash_table.hpp
==============================================================================
--- branches/release/boost/unordered/detail/hash_table.hpp	(original)
+++ branches/release/boost/unordered/detail/hash_table.hpp	2009-05-16 09:38:37 EDT (Sat, 16 May 2009)
@@ -32,6 +32,8 @@
 #include <boost/mpl/and.hpp>
 #include <boost/detail/workaround.hpp>
 #include <boost/utility/swap.hpp>
+#include <boost/preprocessor/seq/size.hpp>
+#include <boost/preprocessor/seq/enum.hpp>
 
 #include <boost/mpl/aux_/config/eti.hpp>
 
@@ -76,18 +78,25 @@
             static std::ptrdiff_t const length;
         };
 
+#define BOOST_UNORDERED_PRIMES \
+        (5ul)(11ul)(17ul)(29ul)(37ul)(53ul)(67ul)(79ul) \
+        (97ul)(131ul)(193ul)(257ul)(389ul)(521ul)(769ul) \
+        (1031ul)(1543ul)(2053ul)(3079ul)(6151ul)(12289ul)(24593ul) \
+        (49157ul)(98317ul)(196613ul)(393241ul)(786433ul) \
+        (1572869ul)(3145739ul)(6291469ul)(12582917ul)(25165843ul) \
+        (50331653ul)(100663319ul)(201326611ul)(402653189ul)(805306457ul) \
+        (1610612741ul)(3221225473ul)(4294967291ul)
+
         template<typename T>
         std::size_t const prime_list_template<T>::value[] = {
-            5ul, 11ul, 17ul, 29ul, 37ul, 53ul, 67ul, 79ul,
-            97ul, 131ul, 193ul, 257ul, 389ul, 521ul, 769ul,
-            1031ul, 1543ul, 2053ul, 3079ul, 6151ul, 12289ul, 24593ul,
-            49157ul, 98317ul, 196613ul, 393241ul, 786433ul,
-            1572869ul, 3145739ul, 6291469ul, 12582917ul, 25165843ul,
-            50331653ul, 100663319ul, 201326611ul, 402653189ul, 805306457ul,
-            1610612741ul, 3221225473ul, 4294967291ul };
+            BOOST_PP_SEQ_ENUM(BOOST_UNORDERED_PRIMES)
+        };
 
         template<typename T>
-        std::ptrdiff_t const prime_list_template<T>::length = 40;
+        std::ptrdiff_t const prime_list_template<T>::length
+            = BOOST_PP_SEQ_SIZE(BOOST_UNORDERED_PRIMES);
+
+#undef BOOST_UNORDERED_PRIMES
 
         typedef prime_list_template<std::size_t> prime_list;