hashtable.cc (__prime_list): Use __SIZEOF_LONG__.

2007-12-03  Paolo Carlini  <pcarlini@suse.de>

	* src/hashtable.cc (__prime_list): Use __SIZEOF_LONG__.

From-SVN: r130592

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 716ca5045a0ce3028139819935db43b91a55ccd3..919d13b5357a0e291cfedb7c93e9a4d41c5b859e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-03  Paolo Carlini  <pcarlini@suse.de>
+
+       * src/hashtable.cc (__prime_list): Use __SIZEOF_LONG__.
+
 2007-12-03  Paolo Carlini  <pcarlini@suse.de>
 
        * src/hashtable.cc: New.

diff --git a/libstdc++-v3/src/hashtable.cc b/libstdc++-v3/src/hashtable.cc
index 8f84927caf7076bff670e0298c7220265603df29..1a957102c2342fd451aa0670dc65bbe14746e35d 100644 (file)
--- a/libstdc++-v3/src/hashtable.cc
+++ b/libstdc++-v3/src/hashtable.cc
@@ -41,7 +41,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
 
 namespace __detail
 {
-  extern const unsigned long __prime_list[256 + 48 + 1] =
+  extern const unsigned long __prime_list[] = // 256 + 1 or 256 + 48 + 1
   {
     2ul, 3ul, 5ul, 7ul, 11ul, 13ul, 17ul, 19ul, 23ul, 29ul, 31ul,
     37ul, 41ul, 43ul, 47ul, 53ul, 59ul, 61ul, 67ul, 71ul, 73ul, 79ul,
@@ -79,43 +79,31 @@ namespace __detail
     386778277ul, 418451333ul, 452718089ul, 489790921ul, 529899637ul,
     573292817ul, 620239453ul, 671030513ul, 725980837ul, 785430967ul,
     849749479ul, 919334987ul, 994618837ul, 1076067617ul, 1164186217ul,
-    1259520799ul, 1362662261ul, 1474249943ul, 1594975441ul,
-    1725587117ul, 1866894511ul, 2019773507ul, 2185171673ul,
-    2364114217ul, 2557710269ul, 2767159799ul, 2993761039ul,
-    3238918481ul, 3504151727ul, 3791104843ul, 4101556399ul,
-    4294967291ul,
+    1259520799ul, 1362662261ul, 1474249943ul, 1594975441ul, 1725587117ul,
+    1866894511ul, 2019773507ul, 2185171673ul, 2364114217ul, 2557710269ul,
+    2767159799ul, 2993761039ul, 3238918481ul, 3504151727ul, 3791104843ul,
+    4101556399ul, 4294967291ul,
     // Sentinel, so we don't have to test the result of lower_bound,
     // or, on 64-bit machines, rest of the table.
-    sizeof(unsigned long) != 8 ? 4294967291ul : (unsigned long)6442450933ull,
-    (unsigned long)8589934583ull,
-    (unsigned long)12884901857ull, (unsigned long)17179869143ull,
-    (unsigned long)25769803693ull, (unsigned long)34359738337ull,
-    (unsigned long)51539607367ull, (unsigned long)68719476731ull,
-    (unsigned long)103079215087ull, (unsigned long)137438953447ull,
-    (unsigned long)206158430123ull, (unsigned long)274877906899ull,
-    (unsigned long)412316860387ull, (unsigned long)549755813881ull,
-    (unsigned long)824633720731ull, (unsigned long)1099511627689ull,
-    (unsigned long)1649267441579ull, (unsigned long)2199023255531ull,
-    (unsigned long)3298534883309ull, (unsigned long)4398046511093ull,
-    (unsigned long)6597069766607ull, (unsigned long)8796093022151ull,
-    (unsigned long)13194139533241ull, (unsigned long)17592186044399ull,
-    (unsigned long)26388279066581ull, (unsigned long)35184372088777ull,
-    (unsigned long)52776558133177ull, (unsigned long)70368744177643ull,
-    (unsigned long)105553116266399ull, (unsigned long)140737488355213ull,
-    (unsigned long)211106232532861ull, (unsigned long)281474976710597ull,
-    (unsigned long)562949953421231ull, (unsigned long)1125899906842597ull,
-    (unsigned long)2251799813685119ull, (unsigned long)4503599627370449ull,
-    (unsigned long)9007199254740881ull, (unsigned long)18014398509481951ull,
-    (unsigned long)36028797018963913ull, (unsigned long)72057594037927931ull,
-    (unsigned long)144115188075855859ull,
-    (unsigned long)288230376151711717ull,
-    (unsigned long)576460752303423433ull,
-    (unsigned long)1152921504606846883ull,
-    (unsigned long)2305843009213693951ull,
-    (unsigned long)4611686018427387847ull,
-    (unsigned long)9223372036854775783ull,
-    (unsigned long)18446744073709551557ull,
-    (unsigned long)18446744073709551557ull    
+#if __SIZEOF_LONG__ != 8
+    4294967291ul
+#else
+    6442450933ul, 8589934583ul, 12884901857ul, 17179869143ul,
+    25769803693ul, 34359738337ul, 51539607367ul, 68719476731ul,
+    103079215087ul, 137438953447ul, 206158430123ul, 274877906899ul,
+    412316860387ul, 549755813881ul, 824633720731ul, 1099511627689ul,
+    1649267441579ul, 2199023255531ul, 3298534883309ul, 4398046511093ul,
+    6597069766607ul, 8796093022151ul, 13194139533241ul, 17592186044399ul,
+    26388279066581ul, 35184372088777ul, 52776558133177ul, 70368744177643ul,
+    105553116266399ul, 140737488355213ul, 211106232532861ul, 281474976710597ul,
+    562949953421231ul, 1125899906842597ul, 2251799813685119ul,
+    4503599627370449ul, 9007199254740881ul, 18014398509481951ul,
+    36028797018963913ul, 72057594037927931ul, 144115188075855859ul,
+    288230376151711717ul, 576460752303423433ul,
+    1152921504606846883ul, 2305843009213693951ul,
+    4611686018427387847ul, 9223372036854775783ul,
+    18446744073709551557ul, 18446744073709551557ul
+#endif
   };
 } // namespace __detail