Merge all hash changes from trunk.

[SVN r46343]
This commit is contained in:
Daniel James
2008-06-12 00:27:13 +00:00
parent 102c76bd98
commit b3e82db752
63 changed files with 637 additions and 552 deletions

View File

@@ -1,5 +1,5 @@
// Copyright 2005-2007 Daniel James.
// Copyright 2005-2008 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)
@@ -11,7 +11,7 @@
# include <boost/functional/hash.hpp>
#endif
#include <boost/detail/lightweight_test.hpp>
#include <boost/test/minimal.hpp>
#include <boost/limits.hpp>
#include <boost/mpl/assert.hpp>
@@ -30,20 +30,20 @@ void pointer_tests()
int int1;
int int2;
BOOST_TEST(x1(0) == x2(0));
BOOST_TEST(x1(&int1) == x2(&int1));
BOOST_TEST(x1(&int2) == x2(&int2));
BOOST_CHECK(x1(0) == x2(0));
BOOST_CHECK(x1(&int1) == x2(&int1));
BOOST_CHECK(x1(&int2) == x2(&int2));
#if defined(TEST_EXTENSIONS)
BOOST_TEST(x1(&int1) == HASH_NAMESPACE::hash_value(&int1));
BOOST_TEST(x1(&int2) == HASH_NAMESPACE::hash_value(&int2));
BOOST_CHECK(x1(&int1) == HASH_NAMESPACE::hash_value(&int1));
BOOST_CHECK(x1(&int2) == HASH_NAMESPACE::hash_value(&int2));
// This isn't specified in Peter's proposal:
BOOST_TEST(x1(0) == 0);
BOOST_CHECK(x1(0) == 0);
#endif
}
int main()
int test_main(int, char**)
{
pointer_tests();
return boost::report_errors();
return 0;
}