feedc0de/boost_utility
1
0 Fork 0
forked from boostorg/utility
Code Pull Requests Activity

Attempt to work around C++20 operator rewriting causinginfinite recursion.

Browse Source 
Fixes https://github.com/boostorg/utility/issues/65.
This commit is contained in:
Andrey Semashev committed 2020-11-30 01:52:44 +03:00
1 parent 37168a3f4b
commit f3963f5375
3 files changed
+46 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/boost/operators.hpp
+18 -1
View File
@@ -100,6 +100,11 @@
#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/core/addressof.hpp>
#if defined(__cpp_impl_three_way_comparison)
#include <boost/core/enable_if.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/type_traits/declval.hpp>
#endif
#if defined(__sgi) && !defined(__GNUC__)
# pragma set woff 1234
@@ -158,9 +163,21 @@ struct less_than_comparable1 : B
template <class T, class U, class B = operators_detail::empty_base<T> >
struct equality_comparable2 : B
{
#if defined(__cpp_impl_three_way_comparison)
template< typename R = decltype(boost::declval< T const& >() == boost::declval< U const& >()) >
friend BOOST_OPERATORS_CONSTEXPR
typename boost::enable_if_c< !boost::is_same< R, bool >::value, bool >::type
operator==(const U& y, const T& x) { return x == y; }
template< typename R = decltype(boost::declval< T const& >() == boost::declval< U const& >()) >
friend BOOST_OPERATORS_CONSTEXPR
typename boost::enable_if_c< !boost::is_same< R, bool >::value, bool >::type
operator!=(const U& y, const T& x) { return !static_cast<bool>(x == y); }
#else
friend BOOST_OPERATORS_CONSTEXPR bool operator==(const U& y, const T& x) { return x == y; }
friend BOOST_OPERATORS_CONSTEXPR bool operator!=(const U& y, const T& x) { return !static_cast<bool>(x == y); }
friend BOOST_OPERATORS_CONSTEXPR bool operator!=(const T& y, const U& x) { return !static_cast<bool>(y == x); }
#endif
friend BOOST_OPERATORS_CONSTEXPR bool operator!=(const T& x, const U& y) { return !static_cast<bool>(x == y); }
};
template <class T, class B = operators_detail::empty_base<T> >
include/boost/operators_v1.hpp
+3 -1
View File
@@ -144,9 +144,11 @@ struct less_than_comparable1 : B
template <class T, class U, class B = ::boost::detail::empty_base<T> >
struct equality_comparable2 : B
{
#if !defined(__cpp_impl_three_way_comparison)
friend bool operator==(const U& y, const T& x) { return x == y; }
friend bool operator!=(const U& y, const T& x) { return !static_cast<bool>(x == y); }
friend bool operator!=(const T& y, const U& x) { return !static_cast<bool>(y == x); }
#endif
friend bool operator!=(const T& x, const U& y) { return !static_cast<bool>(x == y); }
};
template <class T, class B = ::boost::detail::empty_base<T> >