mirror of
https://github.com/boostorg/unordered.git
synced 2025-07-31 20:04:29 +02:00
Merge local develop branch develop
Oops, I merged the wrong 'develop' branch into master. Luckily, there's not much of a difference, so I'm resolving the merge here, and will merge into master soon.
This commit is contained in:
@@ -38,9 +38,11 @@ void find_tests1(X*, test::random_generator generator)
|
|||||||
{
|
{
|
||||||
BOOST_DEDUCED_TYPENAME X::key_type key = test::get_key<X>(*it1);
|
BOOST_DEDUCED_TYPENAME X::key_type key = test::get_key<X>(*it1);
|
||||||
iterator pos = x.find(key);
|
iterator pos = x.find(key);
|
||||||
BOOST_DEDUCED_TYPENAME X::const_iterator const_pos = x_const.find(key);
|
BOOST_DEDUCED_TYPENAME X::const_iterator
|
||||||
|
const_pos = x_const.find(key);
|
||||||
BOOST_TEST(pos != x.end());
|
BOOST_TEST(pos != x.end());
|
||||||
BOOST_TEST(pos != x.end() && x.key_eq()(key, test::get_key<X>(*pos)));
|
BOOST_TEST(pos != x.end() &&
|
||||||
|
x.key_eq()(key, test::get_key<X>(*pos)));
|
||||||
BOOST_TEST(const_pos != x_const.end());
|
BOOST_TEST(const_pos != x_const.end());
|
||||||
BOOST_TEST(const_pos != x_const.end() &&
|
BOOST_TEST(const_pos != x_const.end() &&
|
||||||
x_const.key_eq()(key, test::get_key<X>(*const_pos)));
|
x_const.key_eq()(key, test::get_key<X>(*const_pos)));
|
||||||
|
Reference in New Issue
Block a user