forked from boostorg/unordered
Use a portable hash_value in insert_stable_tests in order to support compilers
without ADL. [SVN r7384]
This commit is contained in:
@@ -9,7 +9,9 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
struct member {
|
namespace insert_stable
|
||||||
|
{
|
||||||
|
struct member {
|
||||||
int tag1_;
|
int tag1_;
|
||||||
int tag2_;
|
int tag2_;
|
||||||
|
|
||||||
@@ -23,20 +25,28 @@ struct member {
|
|||||||
friend bool operator!=(member const& x, member const& y) {
|
friend bool operator!=(member const& x, member const& y) {
|
||||||
return x.tag1_ != y.tag1_;
|
return x.tag1_ != y.tag1_;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
std::size_t hash_value(member const& x) {
|
#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_);
|
return static_cast<std::size_t>(x.tag1_);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void stable_insert_test1() {
|
void stable_insert_test1() {
|
||||||
boost::unordered_multiset<member> x;
|
boost::unordered_multiset<insert_stable::member> x;
|
||||||
|
|
||||||
x.insert(member(1,1));
|
x.insert(insert_stable::member(1,1));
|
||||||
x.insert(member(1,2));
|
x.insert(insert_stable::member(1,2));
|
||||||
x.insert(member(1,3));
|
x.insert(insert_stable::member(1,3));
|
||||||
|
|
||||||
boost::unordered_multiset<member>::const_iterator it = x.begin(), end = x.end();
|
boost::unordered_multiset<insert_stable::member>::const_iterator it = x.begin(), end = x.end();
|
||||||
BOOST_TEST(it != end);
|
BOOST_TEST(it != end);
|
||||||
if(it != end) { BOOST_TEST(it->tag2_ == 1); ++it; }
|
if(it != end) { BOOST_TEST(it->tag2_ == 1); ++it; }
|
||||||
BOOST_TEST(it != end);
|
BOOST_TEST(it != end);
|
||||||
@@ -47,12 +57,12 @@ void stable_insert_test1() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void stable_insert_test2() {
|
void stable_insert_test2() {
|
||||||
boost::unordered_multimap<member, int> x;
|
boost::unordered_multimap<insert_stable::member, int> x;
|
||||||
typedef boost::unordered_multimap<member, int>::const_iterator iterator;
|
typedef boost::unordered_multimap<insert_stable::member, int>::const_iterator iterator;
|
||||||
|
|
||||||
iterator it = x.insert(x.end(), std::make_pair(member(1,1), 1));
|
iterator it = x.insert(x.end(), std::make_pair(insert_stable::member(1,1), 1));
|
||||||
it = x.insert(it, std::make_pair(member(1,2), 2));
|
it = x.insert(it, std::make_pair(insert_stable::member(1,2), 2));
|
||||||
it = x.insert(it, std::make_pair(member(1,3), 3));
|
it = x.insert(it, std::make_pair(insert_stable::member(1,3), 3));
|
||||||
|
|
||||||
it = x.begin();
|
it = x.begin();
|
||||||
iterator end = x.end();
|
iterator end = x.end();
|
||||||
|
Reference in New Issue
Block a user