Merge latest hash developments:

* Avoid float to int warning. * Work around 'using namespace' bug in Visual C++. * Make `<boost/functional/hash/extensions.hpp> self contained. * Move some of the extension implementation from the main hash header into the exensions header. * Remove BOOST_HASH_CHAR_TRAITS from `container_fwd.hpp`. * Other minor changes. Merged revisions 53828,53924,54024-54025,54033-54034,54139-54145,54399 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r53828 | danieljames | 2009-06-12 19:24:47 +0100 (Fri, 12 Jun 2009) | 1 line Try to avoid float to int warning when a float function doesn't exist. ........ r53924 | danieljames | 2009-06-15 08:37:42 +0100 (Mon, 15 Jun 2009) | 4 lines Remove hash_complex_test's dependency on Boost.Random. Only test for a few values, but that should be okay as there isn't much to test. ........ r54024 | danieljames | 2009-06-17 22:22:49 +0100 (Wed, 17 Jun 2009) | 1 line Put the minimum amount of implementation in the same namespace as the 'using namespace' directives in order to avoid Visual C++ 8 bug. ........ r54025 | danieljames | 2009-06-17 22:23:42 +0100 (Wed, 17 Jun 2009) | 1 line Try to avoid using special macro handling code. ........ r54033 | danieljames | 2009-06-18 00:24:28 +0100 (Thu, 18 Jun 2009) | 1 line Add copyright to namespace_fail_test.cpp ........ r54034 | danieljames | 2009-06-18 00:25:12 +0100 (Thu, 18 Jun 2009) | 1 line A couple of missing newlines. ........ r54139 | danieljames | 2009-06-21 10:41:11 +0100 (Sun, 21 Jun 2009) | 1 line A few more comments in boost::hash. ........ r54140 | danieljames | 2009-06-21 10:41:30 +0100 (Sun, 21 Jun 2009) | 1 line Move includes to the header which they're used in. ........ r54141 | danieljames | 2009-06-21 10:41:46 +0100 (Sun, 21 Jun 2009) | 1 line Revert [54025] "Try to avoid using special macro handling code." ........ r54142 | danieljames | 2009-06-21 10:42:05 +0100 (Sun, 21 Jun 2009) | 1 line Get <boost/functional/hash/extensions.hpp> to work. ........ r54143 | danieljames | 2009-06-21 10:42:20 +0100 (Sun, 21 Jun 2009) | 1 line Move BOOST_HASH_CHAR_TRAITS from container_fwd into the hash headers, and undefine it. ........ r54144 | danieljames | 2009-06-21 10:42:40 +0100 (Sun, 21 Jun 2009) | 1 line Move the support for hashing containers into the extension header, and improve the standard tests. ........ r54145 | danieljames | 2009-06-21 10:51:59 +0100 (Sun, 21 Jun 2009) | 1 line I didn't mean to comment this out. ........ r54399 | danieljames | 2009-06-27 08:39:12 +0100 (Sat, 27 Jun 2009) | 1 line Add am implementation note about the Visual C++ problems. ........ [SVN r54402]
2009-06-27 08:12:20 +00:00
parent 786af5df98
commit 2b3bc8c3f4
14 changed files with 312 additions and 177 deletions
@@ -36,10 +36,23 @@ test-suite functional/hash
        [ run hash_complex_test.cpp ]
        [ run link_test.cpp link_test_2.cpp ]
        [ run link_ext_test.cpp link_no_ext_test.cpp ]
+        [ run extensions_hpp_test.cpp ]
        [ run container_fwd_test.cpp ]
        [ compile-fail hash_no_ext_fail_test.cpp ]
+        [ compile-fail namespace_fail_test.cpp ]
        [ run hash_no_ext_macro_1.cpp ]
        [ run hash_no_ext_macro_2.cpp ]
    ;

+test-suite functional/hash_no_ext
+    :
+        [ run hash_number_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_number_test ]
+        [ run hash_pointer_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_pointer_test ]
+        [ run hash_function_pointer_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_function_pointer_test ]
+        [ run hash_float_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_float_test ]
+        [ run hash_long_double_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_long_double_test ]
+        [ run hash_string_test.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_string_test ]
+        [ run link_test.cpp link_test_2.cpp : : : <define>BOOST_HASH_NO_EXTENSIONS : no_ext_link_test ]
+    ;
+
 build-project ../examples ;
@@ -5,7 +5,7 @@

 #if defined(TEST_STD)
 #  define TEST_STD_INCLUDES
-#  define HASH_NAMESPACE std::tr1
+#  define HASH_NAMESPACE std
 #else
 #  define HASH_NAMESPACE boost
 #  if !defined(BOOST_HASH_NO_EXTENSIONS)
@@ -0,0 +1,17 @@
+
+// Copyright 2009 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)
+
+// Check that boost/functional/hash/extensions.hpp works okay.
+//
+// It probably should be in boost/functional/hash/detail, but since it isn't it
+// should work.
+
+#include <boost/functional/hash/extensions.hpp>
+
+int main() {
+    int x[2] = { 2, 3 };
+    boost::hash<int[2]> hf;
+    hf(x);
+}
@@ -5,18 +5,20 @@

 #include "./config.hpp"

-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
-#    include <functional>
-#  else
-#    include <boost/functional/hash.hpp>
-#  endif
+#if !defined(TEST_EXTENSIONS)
+
+int main() {}
+
+#else
+
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
 #endif

 #include <boost/detail/lightweight_test.hpp>

-#ifdef TEST_EXTENSIONS
-
 #include <complex>
 #include <sstream>
 #include <boost/limits.hpp>
@@ -27,11 +29,6 @@
 #pragma warning(disable:4512) // assignment operator could not be generated
 #endif

-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int.hpp>
-#include <boost/random/uniform_real.hpp>
-#include <boost/random/variate_generator.hpp>
-
 #if defined(BOOST_MSVC)
 #pragma warning(pop)
 #endif
@@ -61,33 +58,24 @@ void generic_complex_tests(std::complex<T> v)
 template <class Float>
 void complex_float_tests(Float*)
 {
-    boost::mt19937 rng;
-    boost::uniform_real<Float> uniform;
-    boost::variate_generator<boost::mt19937&, boost::uniform_real<Float> >
-        uniform_generator(rng, uniform);
-
-    for(int i = 0; i < 100; ++i)
-    {
-        std::complex<Float> v(uniform_generator(), uniform_generator());
-        generic_complex_tests(v);
-    }
+    typedef std::complex<Float> complex;
+    generic_complex_tests(complex(0,0));
+    generic_complex_tests(complex(0.5,0));
+    generic_complex_tests(complex(25,0));
+    generic_complex_tests(complex(25,0));
+    generic_complex_tests(complex(-67.5324535,56.23578678));
 }

 template <class Integer>
 void complex_integral_tests(Integer*)
 {
-    boost::mt19937 rng;
-    boost::uniform_int<Integer> uniform(
-            (std::numeric_limits<Integer>::min)(),
-            (std::numeric_limits<Integer>::max)());
-    boost::variate_generator<boost::mt19937&, boost::uniform_int<Integer> >
-        uniform_generator(rng, uniform);
-
-    for(int i = 0; i < 100; ++i)
-    {
-        std::complex<Integer>v(uniform_generator(), uniform_generator());
-        generic_complex_tests(v);
-    }
+    typedef std::complex<Integer> complex;
+    generic_complex_tests(complex(0,0));
+    generic_complex_tests(complex(15342,124));
+    generic_complex_tests(complex(25,54356));
+    generic_complex_tests(complex(5325,2346));
+    generic_complex_tests(complex(-243897,-49923874));
+    generic_complex_tests(complex(-543,763));
 }

 int main()
@@ -105,4 +93,4 @@ int main()
    return boost::report_errors();
 }

-#endif
+#endif // TEST_EXTENSIONS
@@ -15,6 +15,8 @@

 #include <cmath>
 #include <boost/functional/hash/detail/limits.hpp>
+#include <boost/functional/hash/detail/float_functions.hpp>
+#include <boost/detail/workaround.hpp>

 #include <iostream>

@@ -42,8 +44,6 @@ void float_tests(char const* name, T* = 0)
        <<"\n"
        <<"boost::hash_detail::call_ldexp<T>::float_type = "
            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_ldexp<T>::float_type*)0)<<"\n"
-        <<"boost::call_frexp<T>::float_type = "
-            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_frexp<T>::float_type*)0)<<"\n"
        <<"boost::hash_detail::call_frexp<T>::float_type = "
            <<float_type((BOOST_DEDUCED_TYPENAME boost::hash_detail::call_frexp<T>::float_type*)0)<<"\n"
        <<"boost::hash_detail::select_hash_type<T>::type = "
@@ -59,8 +59,10 @@ void float_tests(char const* name, T* = 0)
    BOOST_TEST(zero == minus_zero);
    BOOST_TEST(x1(zero) == x1(minus_zero));

+#if defined(TEST_EXTENSIONS)
    BOOST_TEST(x1(zero) == HASH_NAMESPACE::hash_value(zero));
    BOOST_TEST(x1(minus_zero) == HASH_NAMESPACE::hash_value(minus_zero));
+#endif

    using namespace std;

@@ -78,9 +80,11 @@ void float_tests(char const* name, T* = 0)
        T minus_infinity2 = (T) -1. / zero;
        T minus_infinity3 = (T) 1. / minus_zero;

+#if defined(TEST_EXTENSIONS)
        BOOST_TEST(x1(infinity) == HASH_NAMESPACE::hash_value(infinity));
        BOOST_TEST(x1(minus_infinity)
                == HASH_NAMESPACE::hash_value(minus_infinity));
+#endif

        if(infinity == infinity2)
            BOOST_TEST(x1(infinity) == x1(infinity2));
@@ -134,10 +138,12 @@ void float_tests(char const* name, T* = 0)
    BOOST_TEST(half_max != three_quarter_max);
    BOOST_TEST(quarter_max != three_quarter_max);

+#if defined(TEST_EXTENSIONS)
    BOOST_TEST(x1(max) == HASH_NAMESPACE::hash_value(max));
    BOOST_TEST(x1(half_max) == HASH_NAMESPACE::hash_value(half_max));
    BOOST_TEST(x1(quarter_max) == HASH_NAMESPACE::hash_value(quarter_max));
    BOOST_TEST(x1(three_quarter_max) == HASH_NAMESPACE::hash_value(three_quarter_max));
+#endif

    // The '!=' tests could legitimately fail, but with my hash it indicates a bug.
    BOOST_TEST(x1(max) == x1(max));
@@ -159,12 +165,18 @@ void float_tests(char const* name, T* = 0)
    T v2 = acos((T) 0);
    if(v1 == v2)
        BOOST_TEST(x1(v1) == x1(v2));
+
+#if defined(TEST_EXTENSIONS)
    BOOST_TEST(x1(v1) == HASH_NAMESPACE::hash_value(v1));
    BOOST_TEST(x1(v2) == HASH_NAMESPACE::hash_value(v2));
 #endif
+    
+#endif

+#if defined(TEST_EXTENSIONS)
    BOOST_TEST(x1(boost::hash_detail::limits<T>::epsilon()) ==
            HASH_NAMESPACE::hash_value(boost::hash_detail::limits<T>::epsilon()));
+#endif

    BOOST_TEST(boost::hash_detail::limits<T>::epsilon() != (T) 0);
    if(x1(boost::hash_detail::limits<T>::epsilon()) == x1((T) 0))
@@ -195,7 +207,7 @@ void float_tests(char const* name, T* = 0)
        if(x1(boost::hash_detail::limits<T>::denorm_min()) == x1(zero)) {
            std::cerr<<"x1(denorm_min) == x1(zero) == "<<x1(zero)<<"\n";
        }
-#if !BOOST_WORKAROUND(__DECCXX_VER,<70190006)
+#if !BOOST_WORKAROUND(__DECCXX_VER,<70190006) && defined(TEST_EXTENSIONS)
        // The Tru64/CXX standard library prior to 7.1 contains a bug in the
        // specialization of boost::hash_detail::limits::denorm_min() for long
        // doubles which causes this test to fail.
@@ -213,7 +225,7 @@ void float_tests(char const* name, T* = 0)
    }

 // NaN also causes borland to crash.
-#if !defined(__BORLANDC__)
+#if !defined(__BORLANDC__) && defined(TEST_EXTENSIONS)
    if(boost::hash_detail::limits<T>::has_quiet_NaN) {
        if(x1(boost::hash_detail::limits<T>::quiet_NaN()) == x1(1.0)) {
            std::cerr<<"x1(quiet_NaN) == x1(1.0) == "<<x1(1.0)<<"\n";
@@ -6,8 +6,13 @@
 // This test just makes sure a header which uses hash_fwd can compile without
 // the main hash headers.

-#include "./hash_fwd_test.hpp"
+#if !defined(TEST_EXTENSIONS) || defined(TEST_STD_INCLUDES)

+int main() {}
+
+#else
+
+#include "./hash_fwd_test.hpp"
 #include <boost/detail/lightweight_test.hpp>

 template <class T> void unused(T const&) {}
@@ -30,10 +35,11 @@ void fwd_test()
    unused(y1); unused(y2); unused(y3);
 }

-
 int main()
 {
    fwd_test();
+
    return boost::report_errors();
 }

+#endif // defined(TEST_EXTENSIONS) && !defined(TEST_STD_INCLUDES)
@@ -4,9 +4,17 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 #define HASH_NAMESPACE boost
+
+// Include header without BOOST_HASH_NO_EXTENSIONS defined
+#if defined(BOOST_HASH_NO_EXTENSIONS)
+#undef BOOST_HASH_NO_EXTENSIONS
+#endif
 #include <boost/functional/hash.hpp>
+
+// Include header with BOOST_HASH_NO_EXTENSIONS defined
 #define BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
+
 #include <boost/detail/lightweight_test.hpp>
 #include <deque>
 #include <cassert>
@@ -4,10 +4,17 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

 #define HASH_NAMESPACE boost
+
+// Include header with BOOST_HASH_NO_EXTENSIONS defined
+#if !defined(BOOST_HASH_NO_EXTENSIONS)
 #define BOOST_HASH_NO_EXTENSIONS
+#endif
 #include <boost/functional/hash.hpp>
+
+// Include header without BOOST_HASH_NO_EXTENSIONS defined
 #undef BOOST_HASH_NO_EXTENSIONS
 #include <boost/functional/hash.hpp>
+
 #include <boost/detail/lightweight_test.hpp>
 #include <map>

@@ -5,18 +5,20 @@

 #include "./config.hpp"

-#ifdef TEST_EXTENSIONS
-#  ifdef TEST_STD_INCLUDES
-#    include <functional>
-#  else
-#    include <boost/functional/hash.hpp>
-#  endif
+#if !defined(TEST_EXTENSIONS)
+
+int main() {}
+
+#else
+
+#ifdef TEST_STD_INCLUDES
+#  include <functional>
+#else
+#  include <boost/functional/hash.hpp>
 #endif

 #include <boost/detail/lightweight_test.hpp>

-#ifdef TEST_EXTENSIONS
-
 #include <boost/limits.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
@@ -74,8 +76,6 @@ void hash_range_tests()
    BOOST_TEST(seed == HASH_NAMESPACE::hash_range(values5.begin(), values5.end()));
 }

-#endif
-
 int main()
 {
    hash_range_tests();
@@ -83,3 +83,4 @@ int main()
    return boost::report_errors();
 }

+#endif // TEST_EXTESNIONS
@@ -9,14 +9,23 @@
 #include <vector>

 int f(std::size_t hash1, int* x1) {
+
    // Check that HASH_NAMESPACE::hash<int*> works in both files.
    HASH_NAMESPACE::hash<int*> ptr_hasher;
    BOOST_TEST(hash1 == ptr_hasher(x1));

+#if defined(TEST_EXTENSIONS)
+
    // Check that std::vector<std::size_t> is avaiable in this file.
    std::vector<std::size_t> x;
    x.push_back(*x1);
    HASH_NAMESPACE::hash<std::vector<std::size_t> > vector_hasher;
    return vector_hasher(x) != HASH_NAMESPACE::hash_value(x);
+    
+#else
+
+    return 0;
+
+#endif
 }

@@ -0,0 +1,14 @@
+
+// Copyright 2009 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)
+
+// Check that I haven't inadvertantly pulled namespace std into the global
+// namespace.
+
+#include <list>
+#include <boost/functional/hash.hpp>
+
+typedef list<int> foo;
+
+int main() {}