boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-30 11:27:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary was_called_ statics from transparent test's key comparators

Browse Source
This commit is contained in:
Christian Mazakas
2021-12-21 13:53:08 -08:00
parent e667e6dbd9
commit ee5d4b9e73
1 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test/unordered/transparent_tests.cpp
View File

@ -40,23 +40,11 @@ struct transparent_key_equal
{ {
typedef void is_transparent; typedef void is_transparent;
static bool was_called_;
bool operator()(key const& k1, key const& k2) const { return k1.x_ == k2.x_; } bool operator()(key const& k1, key const& k2) const { return k1.x_ == k2.x_; }
bool operator()(int const x, key const& k1) const bool operator()(int const x, key const& k1) const { return k1.x_ == x; }
{ bool operator()(key const& k1, int const x) const { return k1.x_ == x; }
was_called_ = true;
return k1.x_ == x;
}
bool operator()(key const& k1, int const x) const
{
was_called_ = true;
return k1.x_ == x;
}
}; };
bool transparent_key_equal::was_called_;
struct hasher struct hasher
{ {
std::size_t operator()(key const& k) const std::size_t operator()(key const& k) const
@ -67,24 +55,10 @@ struct hasher
struct key_equal struct key_equal
{ {
static bool was_called_;
bool operator()(key const& k1, key const& k2) const { return k1.x_ == k2.x_; } bool operator()(key const& k1, key const& k2) const { return k1.x_ == k2.x_; }
bool operator()(int const x, key const& k1) const
{
was_called_ = true;
return k1.x_ == x;
}
}; };
bool key_equal::was_called_; void count_reset() { key::count_ = 0; }
void count_reset()
{
key::count_ = 0;
transparent_key_equal::was_called_ = false;
key_equal::was_called_ = false;
}
template <class UnorderedMap> void test_transparent_count() template <class UnorderedMap> void test_transparent_count()
{ {
@ -107,7 +81,6 @@ template <class UnorderedMap> void test_transparent_count()
BOOST_TEST(count == 1); BOOST_TEST(count == 1);
BOOST_TEST(key::count_ == 2); BOOST_TEST(key::count_ == 2);
BOOST_TEST(map.key_eq().was_called_);
count = map.count(1); count = map.count(1);
@ -140,7 +113,6 @@ template <class UnorderedMap> void test_non_transparent_count()
BOOST_TEST(count == 1); BOOST_TEST(count == 1);
BOOST_TEST(key::count_ == 3); BOOST_TEST(key::count_ == 3);
BOOST_TEST(!map.key_eq().was_called_);
count = map.count(1); count = map.count(1);
@ -772,7 +744,7 @@ template <class UnorderedMap> void test_non_transparent_extract()
const_iterator_pair rng = map.equal_range(0); const_iterator_pair rng = map.equal_range(0);
++key_count; ++key_count;
for (const_iterator pos = rng.first; pos != rng.second; ++pos) { for (const_iterator pos = rng.first; pos != rng.second; ++pos) {
BOOST_TEST_NE(pos->second, nh.mapped()); BOOST_TEST_NE(pos->second, nh.mapped());
} }