2005-04-01 16:58:09 +00:00
|
|
|
|
Merge hash and unordered changes.
Remove deprecated headers, move hash_fwd.hpp into hash subdirectory. And
several minor internal changes.
Mostly minor internal details.
Merged revisions 51262-51263,51407-51409,51504-51505,51644-51646,51667 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r51262 | danieljames | 2009-02-15 19:32:04 +0000 (Sun, 15 Feb 2009) | 1 line
Use the new 'boost:' links for the hash, unordered and quickbook documentation.
........
r51263 | danieljames | 2009-02-15 19:32:19 +0000 (Sun, 15 Feb 2009) | 2 lines
Don't copy images for the standalone hash and unordered documentation, was only
really required before the libraries were integrated into boost.
........
r51407 | danieljames | 2009-02-22 23:49:51 +0000 (Sun, 22 Feb 2009) | 1 line
Fix the hash dirname.
........
r51408 | danieljames | 2009-02-22 23:50:04 +0000 (Sun, 22 Feb 2009) | 1 line
Make copy_buckets and move_buckets member functions - so that calling them is a bit simpler.
........
r51409 | danieljames | 2009-02-22 23:50:20 +0000 (Sun, 22 Feb 2009) | 1 line
Move some of the data structure classes out of hash table data.
........
r51504 | danieljames | 2009-03-01 14:15:09 +0000 (Sun, 01 Mar 2009) | 1 line
Add missing return for operator=.
........
r51505 | danieljames | 2009-03-01 14:15:39 +0000 (Sun, 01 Mar 2009) | 3 lines
Make the sort stable.
Doesn't really matter, but it might as well be.
........
r51644 | danieljames | 2009-03-08 09:44:51 +0000 (Sun, 08 Mar 2009) | 1 line
Detab.
........
r51645 | danieljames | 2009-03-08 09:45:11 +0000 (Sun, 08 Mar 2009) | 4 lines
Move hash_fwd into the hash subdirectory.
I should have done this in the last release. But now all of the hash
implementation is in the hash subdirectory.
........
r51646 | danieljames | 2009-03-08 09:45:30 +0000 (Sun, 08 Mar 2009) | 3 lines
Remove deprecated headers.
Fixes #2412.
........
r51667 | danieljames | 2009-03-09 20:56:23 +0000 (Mon, 09 Mar 2009) | 1 line
Update copyright dates in hash and unordered.
........
[SVN r51729]
2009-03-11 22:51:09 +00:00
|
|
|
// Copyright 2005-2009 Daniel James.
|
2007-11-25 18:38:02 +00:00
|
|
|
// 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)
|
2005-04-01 16:58:09 +00:00
|
|
|
|
2009-11-29 16:14:10 +00:00
|
|
|
#include "./config.hpp"
|
2005-04-21 23:43:51 +00:00
|
|
|
#include <boost/config.hpp>
|
|
|
|
|
#include <cstddef>
|
2005-04-01 16:58:09 +00:00
|
|
|
|
|
|
|
|
namespace test
|
|
|
|
|
{
|
|
|
|
|
struct custom
|
|
|
|
|
{
|
|
|
|
|
int value_;
|
|
|
|
|
|
2005-04-21 23:43:51 +00:00
|
|
|
std::size_t hash() const
|
|
|
|
|
{
|
|
|
|
|
return value_ * 10;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if !defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
|
|
|
|
|
friend std::size_t hash_value(custom const& x )
|
|
|
|
|
{
|
|
|
|
|
return x.hash();
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-04-01 16:58:09 +00:00
|
|
|
custom(int x) : value_(x) {}
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-21 23:43:51 +00:00
|
|
|
#if defined(BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP)
|
2005-04-01 16:58:09 +00:00
|
|
|
namespace boost
|
|
|
|
|
{
|
2005-04-01 22:47:36 +00:00
|
|
|
std::size_t hash_value(test::custom x)
|
2005-04-01 16:58:09 +00:00
|
|
|
{
|
|
|
|
|
return x.hash();
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-04-21 23:43:51 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include "./config.hpp"
|
|
|
|
|
|
2012-12-20 20:38:09 +00:00
|
|
|
#ifdef BOOST_HASH_TEST_EXTENSIONS
|
|
|
|
|
# ifdef BOOST_HASH_TEST_STD_INCLUDES
|
2005-04-21 23:43:51 +00:00
|
|
|
# include <functional>
|
|
|
|
|
# else
|
2006-02-13 18:26:00 +00:00
|
|
|
# include <boost/functional/hash.hpp>
|
2005-04-21 23:43:51 +00:00
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-07-19 09:02:10 +00:00
|
|
|
#include <boost/detail/lightweight_test.hpp>
|
2005-04-21 23:43:51 +00:00
|
|
|
|
2012-12-20 20:38:09 +00:00
|
|
|
#ifdef BOOST_HASH_TEST_EXTENSIONS
|
2005-04-21 23:43:51 +00:00
|
|
|
|
|
|
|
|
#include <vector>
|
|
|
|
|
#include <string>
|
|
|
|
|
#include <cctype>
|
2005-04-01 16:58:09 +00:00
|
|
|
|
2006-02-09 19:16:08 +00:00
|
|
|
void custom_tests()
|
2005-04-01 16:58:09 +00:00
|
|
|
{
|
2012-12-20 20:38:09 +00:00
|
|
|
BOOST_HASH_TEST_NAMESPACE::hash<test::custom> custom_hasher;
|
2008-07-19 09:02:10 +00:00
|
|
|
BOOST_TEST(custom_hasher(10) == 100u);
|
2005-04-01 16:58:09 +00:00
|
|
|
test::custom x(55);
|
2008-07-19 09:02:10 +00:00
|
|
|
BOOST_TEST(custom_hasher(x) == 550u);
|
2005-04-01 16:58:09 +00:00
|
|
|
|
2005-04-16 16:56:27 +00:00
|
|
|
{
|
2012-12-20 20:38:09 +00:00
|
|
|
using namespace BOOST_HASH_TEST_NAMESPACE;
|
2008-07-19 09:02:10 +00:00
|
|
|
BOOST_TEST(custom_hasher(x) == hash_value(x));
|
2005-04-16 16:56:27 +00:00
|
|
|
}
|
|
|
|
|
|
2005-04-01 16:58:09 +00:00
|
|
|
std::vector<test::custom> custom_vector;
|
|
|
|
|
custom_vector.push_back(5);
|
|
|
|
|
custom_vector.push_back(25);
|
|
|
|
|
custom_vector.push_back(35);
|
|
|
|
|
|
|
|
|
|
std::size_t seed = 0;
|
2012-12-20 20:38:09 +00:00
|
|
|
BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom(5));
|
|
|
|
|
BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom(25));
|
|
|
|
|
BOOST_HASH_TEST_NAMESPACE::hash_combine(seed, test::custom(35));
|
2005-04-01 16:58:09 +00:00
|
|
|
|
2005-04-21 23:43:51 +00:00
|
|
|
std::size_t seed2 = 0;
|
2012-12-20 20:38:09 +00:00
|
|
|
BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 50u);
|
|
|
|
|
BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 250u);
|
|
|
|
|
BOOST_HASH_TEST_NAMESPACE::hash_combine(seed2, 350u);
|
2005-04-21 23:43:51 +00:00
|
|
|
|
2012-12-20 20:38:09 +00:00
|
|
|
BOOST_TEST(seed == BOOST_HASH_TEST_NAMESPACE::hash_range(
|
2010-01-08 05:38:39 +00:00
|
|
|
custom_vector.begin(), custom_vector.end()));
|
2008-07-19 09:02:10 +00:00
|
|
|
BOOST_TEST(seed == seed2);
|
2005-04-01 16:58:09 +00:00
|
|
|
}
|
|
|
|
|
|
2012-12-20 20:38:09 +00:00
|
|
|
#endif // BOOST_HASH_TEST_EXTENSIONS
|
2006-02-09 19:16:08 +00:00
|
|
|
|
2008-07-19 09:02:10 +00:00
|
|
|
int main()
|
2006-02-09 19:16:08 +00:00
|
|
|
{
|
2012-12-20 20:38:09 +00:00
|
|
|
#ifdef BOOST_HASH_TEST_EXTENSIONS
|
2006-02-09 19:16:08 +00:00
|
|
|
custom_tests();
|
|
|
|
|
#endif
|
2008-07-19 09:02:10 +00:00
|
|
|
return boost::report_errors();
|
2006-02-09 19:16:08 +00:00
|
|
|
}
|