2007-05-20 17:37:27 +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 2007-2009 Daniel James.
|
2007-05-20 17:37:27 +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)
|
|
|
|
|
|
|
|
#include <boost/unordered_set.hpp>
|
|
|
|
#include <boost/unordered_map.hpp>
|
2008-03-24 17:03:15 +00:00
|
|
|
#include "../helpers/test.hpp"
|
2007-05-20 17:37:27 +00:00
|
|
|
|
|
|
|
#include <iostream>
|
|
|
|
|
2007-07-07 09:42:56 +00:00
|
|
|
namespace insert_stable
|
|
|
|
{
|
|
|
|
struct member {
|
|
|
|
int tag1_;
|
|
|
|
int tag2_;
|
|
|
|
|
|
|
|
member() : tag1_(0), tag2_(0) {}
|
|
|
|
member(int t1, int t2) : tag1_(t1), tag2_(t2) {}
|
|
|
|
|
|
|
|
friend bool operator==(member const& x, member const& y) {
|
|
|
|
return x.tag1_ == y.tag1_;
|
|
|
|
}
|
|
|
|
|
|
|
|
friend bool operator!=(member const& x, member const& y) {
|
|
|
|
return x.tag1_ != y.tag1_;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
}
|
2007-05-20 17:37:27 +00:00
|
|
|
|
2007-07-07 09:42:56 +00:00
|
|
|
#ifdef BOOST_NO_ARGUMENT_DEPENDENT_LOOKUP
|
|
|
|
namespace boost
|
|
|
|
#else
|
|
|
|
namespace insert_stable
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
std::size_t hash_value(insert_stable::member const& x) {
|
|
|
|
return static_cast<std::size_t>(x.tag1_);
|
2007-05-20 17:37:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
UNORDERED_AUTO_TEST(stable_insert_test1) {
|
2007-07-07 09:42:56 +00:00
|
|
|
boost::unordered_multiset<insert_stable::member> x;
|
2007-05-20 17:37:27 +00:00
|
|
|
|
2007-07-07 09:42:56 +00:00
|
|
|
x.insert(insert_stable::member(1,1));
|
|
|
|
x.insert(insert_stable::member(1,2));
|
|
|
|
x.insert(insert_stable::member(1,3));
|
2007-05-20 17:37:27 +00:00
|
|
|
|
2007-07-07 09:42:56 +00:00
|
|
|
boost::unordered_multiset<insert_stable::member>::const_iterator it = x.begin(), end = x.end();
|
2008-04-17 07:39:24 +00:00
|
|
|
BOOST_CHECK(it != end);
|
|
|
|
if(it != end) { BOOST_CHECK(it->tag2_ == 1); ++it; }
|
|
|
|
BOOST_CHECK(it != end);
|
|
|
|
if(it != end) { BOOST_CHECK(it->tag2_ == 2); ++it; }
|
|
|
|
BOOST_CHECK(it != end);
|
|
|
|
if(it != end) { BOOST_CHECK(it->tag2_ == 3); ++it; }
|
|
|
|
BOOST_CHECK(it == end);
|
2007-05-20 17:37:27 +00:00
|
|
|
}
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
UNORDERED_AUTO_TEST(stable_insert_test2) {
|
2007-07-07 09:42:56 +00:00
|
|
|
boost::unordered_multimap<insert_stable::member, int> x;
|
|
|
|
typedef boost::unordered_multimap<insert_stable::member, int>::const_iterator iterator;
|
2007-05-20 17:37:27 +00:00
|
|
|
|
2007-07-07 09:42:56 +00:00
|
|
|
iterator it = x.insert(x.end(), std::make_pair(insert_stable::member(1,1), 1));
|
|
|
|
it = x.insert(it, std::make_pair(insert_stable::member(1,2), 2));
|
|
|
|
it = x.insert(it, std::make_pair(insert_stable::member(1,3), 3));
|
2007-05-20 17:37:27 +00:00
|
|
|
|
|
|
|
it = x.begin();
|
|
|
|
iterator end = x.end();
|
2008-04-17 07:39:24 +00:00
|
|
|
BOOST_CHECK(it != end);
|
|
|
|
if(it != end) { BOOST_CHECK(it->first.tag2_ == 1 && it->second == 1); ++it; }
|
|
|
|
BOOST_CHECK(it != end);
|
|
|
|
if(it != end) { BOOST_CHECK(it->first.tag2_ == 2 && it->second == 2); ++it; }
|
|
|
|
BOOST_CHECK(it != end);
|
|
|
|
if(it != end) { BOOST_CHECK(it->first.tag2_ == 3 && it->second == 3); ++it; }
|
|
|
|
BOOST_CHECK(it == end);
|
2007-05-20 17:37:27 +00:00
|
|
|
}
|
|
|
|
|
2008-03-24 17:03:15 +00:00
|
|
|
RUN_TESTS()
|