Copy hash library from 1.34.1 over trunk.

For the first merge with the release branch, I only want to include some of the
changes I've been working on (fixes and some trivial changes), so I'm starting
again from 1.34.1.


[SVN r38873]

test/Jamfile.v2

@@ -1,15 +1,13 @@
 
-# Copyright 2005-2007 Daniel James.
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+#  subject to the Boost Software License, Version 1.0. (See accompanying
+#  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 import testing ;
 
 project hash-tests
     : requirements
         <toolset>gcc:<define>_GLIBCXX_DEBUG
-        "<toolset>gcc:<cxxflags>-Wsign-promo -Wextra"
-        <toolset>msvc:<cxxflags>/W4
     ;
 
 test-suite functional/hash
@@ -32,7 +30,6 @@ test-suite functional/hash
         [ run hash_deque_test.cpp ]
         [ run hash_set_test.cpp ]
         [ run hash_map_test.cpp ]
-        [ run hash_complex_test.cpp ]
         [ run link_test.cpp link_test_2.cpp ]
         [ run link_ext_test.cpp link_no_ext_test.cpp ]
         [ run container_fwd_test.cpp ]

test/compile_time.hpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
 #include <boost/static_assert.hpp>
@@ -12,5 +12,5 @@ void compile_time_tests(T*)
 {
     BOOST_STATIC_ASSERT((boost::is_base_and_derived<
         std::unary_function<T, std::size_t>, HASH_NAMESPACE::hash<T> >::value));
-}
+};
 

test/config.hpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if defined(TEST_STD)
 #  define TEST_STD_INCLUDES

test/container_fwd_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/detail/container_fwd.hpp>
 

test/hash_built_in_array_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_custom_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
 #include <cstddef>

test/hash_deque_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_float_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
@@ -18,23 +18,18 @@
 
 #include <iostream>
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#pragma warning(disable:4127) // conditional expression is constant
-#endif
-
 template <class T>
 void float_tests(char const* name, T* = 0)
 {
     std::cerr<<"\n"
         <<"Testing " BOOST_STRINGIZE(HASH_NAMESPACE) "::hash<"<<name<<">\n"
         <<"\n"
-        <<"boost::hash_detail::limits<T>::digits = "
-            <<boost::hash_detail::limits<T>::digits<<"\n"
-        <<"boost::hash_detail::limits<int>::digits = "
-            <<boost::hash_detail::limits<int>::digits<<"\n"
-        <<"boost::hash_detail::limits<std::size_t>::digits = "
-            <<boost::hash_detail::limits<std::size_t>::digits<<"\n"
+        <<"std::numeric_limits<T>::digits = "
+            <<std::numeric_limits<T>::digits<<"\n"
+        <<"std::numeric_limits<int>::digits = "
+            <<std::numeric_limits<int>::digits<<"\n"
+        <<"std::numeric_limits<std::size_t>::digits = "
+            <<std::numeric_limits<std::size_t>::digits<<"\n"
         <<"\n"
         ;
 
@@ -55,11 +50,11 @@ void float_tests(char const* name, T* = 0)
 #if defined(__BORLANDC__)
     std::cerr<<"Not running infinity checks on Borland, as it causes it to crash.\n";
 #else
-    if(boost::hash_detail::limits<T>::has_infinity) {
+    if(std::numeric_limits<T>::has_infinity) {
         T infinity = -log(zero);
         T infinity2 = (T) 1. / zero;
         T infinity3 = (T) -1. / minus_zero;
-        T infinity4 = boost::hash_detail::limits<T>::infinity();
+        T infinity4 = std::numeric_limits<T>::infinity();
 
         T minus_infinity = log(zero);
         T minus_infinity2 = (T) -1. / zero;
@@ -71,7 +66,7 @@ void float_tests(char const* name, T* = 0)
 
         if(infinity == infinity2)
             BOOST_TEST(x1(infinity) == x1(infinity2));
-        if(infinity == infinity3)
+        if(infinity == infinity3);
             BOOST_TEST(x1(infinity) == x1(infinity3));
         if(infinity == infinity4)
             BOOST_TEST(x1(infinity) == x1(infinity4));
@@ -89,26 +84,26 @@ void float_tests(char const* name, T* = 0)
 
         // This should really be 'has_denorm == denorm_present' but some
         // compilers don't have 'denorm_present'. See also a later use.
-        if(boost::hash_detail::limits<T>::has_denorm) {
-            if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(infinity)) {
+        if(std::numeric_limits<T>::has_denorm) {
+            if(x1(std::numeric_limits<T>::denorm_min()) == x1(infinity)) {
                 std::cerr<<"x1(denorm_min) == x1(infinity) == "<<x1(infinity)<<"\n";
             }
-            if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(minus_infinity)) {
+            if(x1(std::numeric_limits<T>::denorm_min()) == x1(minus_infinity)) {
                 std::cerr<<"x1(denorm_min) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
             }
         }
-        if(boost::hash_detail::limits<T>::has_quiet_NaN) {
-            if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(infinity)) {
+        if(std::numeric_limits<T>::has_quiet_NaN) {
+            if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(infinity)) {
                 std::cerr<<"x1(quiet_NaN) == x1(infinity) == "<<x1(infinity)<<"\n";
             }
-            if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(minus_infinity)) {
+            if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(minus_infinity)) {
                 std::cerr<<"x1(quiet_NaN) == x1(-infinity) == "<<x1(minus_infinity)<<"\n";
             }
         }
     }
 #endif
 
-    T max = (boost::hash_detail::limits<T>::max)();
+    T max = (std::numeric_limits<T>::max)();
     T half_max = max / 2;
     T quarter_max = max / 4;
     T three_quarter_max = max - quarter_max;
@@ -142,50 +137,50 @@ void float_tests(char const* name, T* = 0)
     BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
 #endif
 
-    BOOST_TEST(x1(boost::hash_detail::limits<T>::epsilon()) ==
-            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::epsilon()));
+    BOOST_TEST(x1(std::numeric_limits<T>::epsilon()) ==
+            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::epsilon()));
 
-    BOOST_TEST(boost::hash_detail::limits<T>::epsilon() != (T) 0);
-    if(x1(boost::hash_detail::limits<T>::epsilon()) == x1((T) 0))
+    BOOST_TEST(std::numeric_limits<T>::epsilon() != (T) 0);
+    if(x1(std::numeric_limits<T>::epsilon()) == x1((T) 0))
         std::cerr<<"x1(epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
 
-    BOOST_TEST(-boost::hash_detail::limits<T>::epsilon() != (T) 0);
-    if(x1(-boost::hash_detail::limits<T>::epsilon()) == x1((T) 0))
+    BOOST_TEST(-std::numeric_limits<T>::epsilon() != (T) 0);
+    if(x1(-std::numeric_limits<T>::epsilon()) == x1((T) 0))
         std::cerr<<"x1(-epsilon) == x1(0) == "<<x1((T) 0)<<"\n";
 
-    BOOST_TEST((T) 1 + boost::hash_detail::limits<T>::epsilon() != (T) 1);
-    if(x1((T) 1 + boost::hash_detail::limits<T>::epsilon()) == x1((T) 1))
+    BOOST_TEST((T) 1 + std::numeric_limits<T>::epsilon() != (T) 1);
+    if(x1((T) 1 + std::numeric_limits<T>::epsilon()) == x1((T) 1))
         std::cerr<<"x1(1 + epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
 
-    BOOST_TEST((T) 1 - boost::hash_detail::limits<T>::epsilon() != (T) 1);
-    if(x1((T) 1 - boost::hash_detail::limits<T>::epsilon()) == x1((T) 1))
+    BOOST_TEST((T) 1 - std::numeric_limits<T>::epsilon() != (T) 1);
+    if(x1((T) 1 - std::numeric_limits<T>::epsilon()) == x1((T) 1))
         std::cerr<<"x1(1 - epsilon) == x1(1) == "<<x1((T) 1)<<"\n";
 
-    BOOST_TEST((T) -1 + boost::hash_detail::limits<T>::epsilon() != (T) -1);
-    if(x1((T) -1 + boost::hash_detail::limits<T>::epsilon()) == x1((T) -1))
+    BOOST_TEST((T) -1 + std::numeric_limits<T>::epsilon() != (T) -1);
+    if(x1((T) -1 + std::numeric_limits<T>::epsilon()) == x1((T) -1))
         std::cerr<<"x1(-1 + epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
 
-    BOOST_TEST((T) -1 - boost::hash_detail::limits<T>::epsilon() != (T) -1);
-    if(x1((T) -1 - boost::hash_detail::limits<T>::epsilon()) == x1((T) -1))
+    BOOST_TEST((T) -1 - std::numeric_limits<T>::epsilon() != (T) -1);
+    if(x1((T) -1 - std::numeric_limits<T>::epsilon()) == x1((T) -1))
         std::cerr<<"x1(-1 - epsilon) == x1(-1) == "<<x1((T) -1)<<"\n";
 
     // As before.
-    if(boost::hash_detail::limits<T>::has_denorm) {
-        if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(zero)) {
+    if(std::numeric_limits<T>::has_denorm) {
+        if(x1(std::numeric_limits<T>::denorm_min()) == x1(zero)) {
             std::cerr<<"x1(denorm_min) == x1(zero) == "<<x1(zero)<<"\n";
         }
 #if !BOOST_WORKAROUND(__DECCXX_VER,<70190006)
         // The Tru64/CXX standard library prior to 7.1 contains a bug in the
-        // specialization of boost::hash_detail::limits::denorm_min() for long
+        // specialization of std::numeric_limits::denorm_min() for long
         // doubles which causes this test to fail.
-        if(x1(boost::hash_detail::limits<T>::denorm_min()) !=
-            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::denorm_min()))
+        if(x1(std::numeric_limits<T>::denorm_min()) !=
+            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::denorm_min()))
         {
-            std::cerr<<"x1(boost::hash_detail::limits<T>::denorm_min()) = "
-                << x1(boost::hash_detail::limits<T>::denorm_min())
-                << "\nhash_value(boost::hash_detail::limits<T>::denorm_min()) = "
+            std::cerr<<"x1(std::numeric_limits<T>::denorm_min()) = "
+                << x1(std::numeric_limits<T>::denorm_min())
+                << "\nhash_value(std::numeric_limits<T>::denorm_min()) = "
                 << HASH_NAMESPACE::hash_value(
-                        boost::hash_detail::limits<T>::denorm_min())
+                        std::numeric_limits<T>::denorm_min())
                 << "\nx1(0) = "<<x1(0)<<"\n";
         }
 #endif
@@ -193,12 +188,12 @@ void float_tests(char const* name, T* = 0)
 
 // NaN also causes borland to crash.
 #if !defined(__BORLANDC__)
-    if(boost::hash_detail::limits<T>::has_quiet_NaN) {
-        if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(1.0)) {
+    if(std::numeric_limits<T>::has_quiet_NaN) {
+        if(x1(std::numeric_limits<T>::quiet_NaN()) == x1(1.0)) {
             std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
         }
-        BOOST_TEST(x1(boost::hash_detail::limits<T>::quiet_NaN()) ==
-            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::quiet_NaN()));
+        BOOST_TEST(x1(std::numeric_limits<T>::quiet_NaN()) ==
+            HASH_NAMESPACE::hash_value(std::numeric_limits<T>::quiet_NaN()));
     }
 #endif
 }
@@ -231,6 +226,3 @@ int main()
     return boost::report_errors();
 }
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif

test/hash_friend_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/config.hpp>
 #include <cstddef>

test/hash_function_pointer_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_fwd_test.hpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_fwd_test_1.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // This checks that template code implemented using hash_fwd will work.
 

test/hash_fwd_test_2.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // This test just makes sure a header which uses hash_fwd can compile without
 // the main hash headers.

test/hash_global_namespace_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // This test demonstrates an ADL bug in Borland 5.5 where ADL isn't performed
 // in the global namespace.
@@ -44,7 +44,7 @@ namespace boost
 #  ifdef TEST_STD_INCLUDES
 #    include <functional>
 #  else
-#    include <boost/functional/hash.hpp>
+#    include <boost/functional/hash/hash.hpp>
 #  endif
 #endif
 

test/hash_list_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_map_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_map_test.hpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
@@ -9,11 +9,6 @@
 
 #include <boost/preprocessor/cat.hpp>
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#pragma warning(disable:4245) // signed/unsigned mismatch
-#endif
-
 namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
 {
     template <class T>
@@ -65,9 +60,5 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
     }
 }
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
-
 #undef CONTAINER_TYPE
 #endif

test/hash_no_ext_fail_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 

test/hash_no_ext_macro_1.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>

test/hash_no_ext_macro_2.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS

test/hash_number_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 
@@ -21,24 +21,17 @@
 
 #include "./compile_time.hpp"
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#pragma warning(disable:4127) // conditional expression is constant
-#pragma warning(disable:4309) // truncation of constant value
-#pragma warning(disable:4310) // cast truncates constant value
-#endif
-
 template <class T>
 void numeric_test(T*)
 {
-    typedef boost::hash_detail::limits<T> limits;
+    typedef std::numeric_limits<T> limits;
 
     compile_time_tests((T*) 0);
 
     HASH_NAMESPACE::hash<T> x1;
     HASH_NAMESPACE::hash<T> x2;
 
-    T v1 = (T) -5;
+    T v1 = -5;
     BOOST_TEST(x1(v1) == x2(v1));
     BOOST_TEST(x1(T(-5)) == x2(T(-5)));
     BOOST_TEST(x1(T(0)) == x2(T(0)));
@@ -55,8 +48,7 @@ void numeric_test(T*)
 
     if (limits::is_integer)
     {
-        BOOST_TEST(HASH_NAMESPACE::hash_value(T((std::size_t)-5))
-                == (std::size_t)T(-5));
+        BOOST_TEST(HASH_NAMESPACE::hash_value(T(-5)) == (std::size_t)T(-5));
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(0)) == (std::size_t)T(0u));
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(10)) == (std::size_t)T(10u));
         BOOST_TEST(HASH_NAMESPACE::hash_value(T(25)) == (std::size_t)T(25u));
@@ -67,7 +59,7 @@ void numeric_test(T*)
 template <class T>
 void limits_test(T*)
 {
-    typedef boost::hash_detail::limits<T> limits;
+    typedef std::numeric_limits<T> limits;
 
     if(limits::is_specialized)
     {
@@ -98,7 +90,7 @@ void limits_test(T*)
 template <class T>
 void poor_quality_tests(T*)
 {
-    typedef boost::hash_detail::limits<T> limits;
+    typedef std::numeric_limits<T> limits;
 
     HASH_NAMESPACE::hash<T> x1;
     HASH_NAMESPACE::hash<T> x2;
@@ -113,29 +105,16 @@ void poor_quality_tests(T*)
         BOOST_TEST(x1((limits::max)()) != x2((limits::max)() - 1));
 }
 
-void bool_test()
-{
-    HASH_NAMESPACE::hash<bool> x1;
-    HASH_NAMESPACE::hash<bool> x2;
-    
-    BOOST_TEST(x1(true) == x2(true));
-    BOOST_TEST(x1(false) == x2(false));
-    BOOST_TEST(x1(true) != x2(false));
-    BOOST_TEST(x1(false) != x2(true));
-}
 
 #define NUMERIC_TEST(type, name) \
     std::cerr<<"Testing: " BOOST_STRINGIZE(name) "\n"; \
     numeric_test((type*) 0); \
     limits_test((type*) 0); \
     poor_quality_tests((type*) 0);
-#define NUMERIC_TEST_NO_LIMITS(type, name) \
-    std::cerr<<"Testing: " BOOST_STRINGIZE(name) "\n"; \
-    numeric_test((type*) 0); \
-    poor_quality_tests((type*) 0);
 
 int main()
 {
+    NUMERIC_TEST(bool, bool)
     NUMERIC_TEST(char, char)
     NUMERIC_TEST(signed char, schar)
     NUMERIC_TEST(unsigned char, uchar)
@@ -149,20 +128,11 @@ int main()
     NUMERIC_TEST(long, hash_long)
     NUMERIC_TEST(unsigned long, ulong)
 
-#if defined(BOOST_HAS_LONG_LONG)
-    NUMERIC_TEST_NO_LIMITS(long long, hash_longlong)
-    NUMERIC_TEST_NO_LIMITS(unsigned long long, ulonglong)
-#endif
-
     NUMERIC_TEST(float, float)
     NUMERIC_TEST(double, double)
     NUMERIC_TEST(long double, ldouble)
 
-    bool_test();
-
     return boost::report_errors();
 }
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
+

test/hash_pointer_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_range_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_sequence_test.hpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
@@ -9,11 +9,6 @@
 
 #include <boost/preprocessor/cat.hpp>
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#pragma warning(disable:4245) // signed/unsigned mismatch
-#endif
-
 namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
 {
     template <class T>
@@ -68,9 +63,5 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
     }
 }
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
-
 #undef CONTAINER_TYPE
 #endif

test/hash_set_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_set_test.hpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #if !defined(CONTAINER_TYPE)
 #error "CONTAINER_TYPE not defined"
@@ -9,17 +9,12 @@
 
 #include <boost/preprocessor/cat.hpp>
 
-#if defined(BOOST_MSVC)
-#pragma warning(push)
-#pragma warning(disable:4245) // signed/unsigned mismatch
-#endif
-
 namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
 {
     template <class T>
     void integer_tests(T* = 0)
     {
-        const int number_of_containers = 12;
+        const int number_of_containers = 11;
         T containers[number_of_containers];
 
         for(int i = 0; i < 5; ++i) {
@@ -35,11 +30,6 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         containers[9].insert(-1);
         containers[10].insert(-1);
         containers[10].insert(1);
-        containers[11].insert(1);
-        containers[11].insert(2);
-        containers[11].insert(3);
-        containers[11].insert(4);
-        containers[11].insert(5);
 
         HASH_NAMESPACE::hash<T> hasher;
 
@@ -71,9 +61,5 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
     }
 }
 
-#if defined(BOOST_MSVC)
-#pragma warning(pop)
-#endif
-
 #undef CONTAINER_TYPE
 #endif

test/hash_string_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/hash_value_array_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 // On some compilers hash_value isn't available for arrays, so I test it
 // separately from the main array tests.

test/hash_vector_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include "./config.hpp"
 

test/link_ext_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2006-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 #include <boost/functional/hash.hpp>
@@ -17,7 +17,6 @@ int f(std::size_t hash1, int* x1) {
     std::vector<std::size_t> x;
     x.push_back(*x1);
     HASH_NAMESPACE::hash<std::vector<std::size_t> > vector_hasher;
-    BOOST_TEST(vector_hasher(x) == HASH_NAMESPACE::hash_value(x));
-    return boost::report_errors();
+    return vector_hasher(x) != HASH_NAMESPACE::hash_value(x);
 }
 

test/link_no_ext_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define HASH_NAMESPACE boost
 #define BOOST_HASH_NO_EXTENSIONS

test/link_test.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/hash.hpp>
 

test/link_test_2.cpp

@@ -1,7 +1,7 @@
 
-// Copyright 2005-2007 Daniel James.
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//  Copyright Daniel James 2005-2006. Use, modification, and distribution are
+//  subject to the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/functional/hash.hpp>