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

Merge pull request #38 from LeonineKing1199/ambiguous-reversed-operator

Browse Source 
Ambiguous reversed operator fixes
This commit is contained in:
Peter Dimov
2021-11-19 04:25:45 +02:00
committed by GitHub
parent 1e553df5b6 2e1ef850e3
commit 4a90ae5b0f
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/unordered/detail/implementation.hpp
View File

@ -827,13 +827,13 @@ namespace boost {
T* operator->() { return value_.value_ptr(); } T* operator->() { return value_.value_ptr(); }
T const* operator->() const { return value_.value_ptr(); } T const* operator->() const { return value_.value_ptr(); }
bool operator==(optional<T> const& x) bool operator==(optional<T> const& x) const
{ {
return has_value_ ? x.has_value_ && value_.value() == x.value_.value() return has_value_ ? x.has_value_ && value_.value() == x.value_.value()
: !x.has_value_; : !x.has_value_;
} }
bool operator!=(optional<T> const& x) { return !((*this) == x); } bool operator!=(optional<T> const& x) const { return !((*this) == x); }
void swap(optional<T>& x) void swap(optional<T>& x)
{ {

4
test/helpers/list.hpp
View File

@ -113,6 +113,10 @@ namespace test {
ptr_ = ptr_->next_; ptr_ = ptr_->next_;
return tmp; return tmp;
} }
bool operator==(list_iterator y) const { return ptr_ == y.ptr_; }
bool operator!=(list_iterator y) const { return ptr_ != y.ptr_; }
bool operator==(const_iterator y) const { return ptr_ == y.ptr_; } bool operator==(const_iterator y) const { return ptr_ == y.ptr_; }
bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; } bool operator!=(const_iterator y) const { return ptr_ != y.ptr_; }
}; };

6
test/unordered/allocator_traits.cpp
View File

@ -65,9 +65,9 @@
{ \ { \
return (std::numeric_limits<size_type>::max)(); \ return (std::numeric_limits<size_type>::max)(); \
} \ } \
bool operator==(name<T> const&) { return true; } \ bool operator==(name<T> const&) const { return true; } \
bool operator!=(name<T> const&) { return false; } \ bool operator!=(name<T> const&) const { return false; } \
/**/ /**/
struct yes_type struct yes_type
{ {

4
test/unordered/deduction_tests.cpp
View File

@ -30,8 +30,8 @@ template <typename T> struct test_allocator
template <typename T2> test_allocator(test_allocator<T2> const&) {} template <typename T2> test_allocator(test_allocator<T2> const&) {}
T* allocate(std::size_t n) const { return (T*)malloc(sizeof(T) * n); } T* allocate(std::size_t n) const { return (T*)malloc(sizeof(T) * n); }
void deallocate(T* ptr, std::size_t) const { free(ptr); } void deallocate(T* ptr, std::size_t) const { free(ptr); }
bool operator==(test_allocator const&) { return true; } bool operator==(test_allocator const&) const { return true; }
bool operator!=(test_allocator const&) { return false; } bool operator!=(test_allocator const&) const { return false; }
}; };
#endif #endif