dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Changing mdb_iterator comparison operators to address C++20 overloaded comparison operator ambiguity.

Browse source
This commit is contained in:
clemahieu 2023-01-14 15:03:26 +00:00
commit d1b4ad2ece
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
nano/node/lmdb/lmdb_iterator.hpp
View file

@ -96,6 +96,16 @@ public:
return &current; return &current;
} }
bool operator== (nano::mdb_iterator<T, U> const & base_a) const
{
auto const other_a (boost::polymorphic_downcast<nano::mdb_iterator<T, U> const *> (&base_a));
auto result (current.first.data () == other_a->current.first.data ());
debug_assert (!result || (current.first.size () == other_a->current.first.size ()));
debug_assert (!result || (current.second.data () == other_a->current.second.data ()));
debug_assert (!result || (current.second.size () == other_a->current.second.size ()));
return result;
}
bool operator== (nano::store_iterator_impl<T, U> const & base_a) const override bool operator== (nano::store_iterator_impl<T, U> const & base_a) const override
{ {
auto const other_a (boost::polymorphic_downcast<nano::mdb_iterator<T, U> const *> (&base_a)); auto const other_a (boost::polymorphic_downcast<nano::mdb_iterator<T, U> const *> (&base_a));
@ -210,11 +220,21 @@ public:
return least_iterator ().operator-> (); return least_iterator ().operator-> ();
} }
bool operator== (nano::mdb_merge_iterator<T, U> const & other) const
{
return *impl1 == *other.impl1 && *impl2 == *other.impl2;
}
bool operator!= (nano::mdb_merge_iterator<T, U> const & base_a) const
{
return !(*this == base_a);
}
bool operator== (nano::store_iterator_impl<T, U> const & base_a) const override bool operator== (nano::store_iterator_impl<T, U> const & base_a) const override
{ {
debug_assert ((dynamic_cast<nano::mdb_merge_iterator<T, U> const *> (&base_a) != nullptr) && "Incompatible iterator comparison"); debug_assert ((dynamic_cast<nano::mdb_merge_iterator<T, U> const *> (&base_a) != nullptr) && "Incompatible iterator comparison");
auto & other (static_cast<nano::mdb_merge_iterator<T, U> const &> (base_a)); auto & other (static_cast<nano::mdb_merge_iterator<T, U> const &> (base_a));
return *impl1 == *other.impl1 && *impl2 == *other.impl2; return *this == other;
} }
bool is_end_sentinal () const override bool is_end_sentinal () const override