Skip to content

R
riscv-gcc-1
Commit 7c69a7d9 by Jonathan Wakely Committed by Jonathan Wakely
Options

PR libstdc++/85040 fix std::less<void> etc. ambiguities 

	PR libstdc++/85040
	* include/bits/stl_function.h (greater::__not_overloaded)
	(less::__not_overloaded, greater_equal::__not_overloaded)
	(less_equal::__not_overloaded): Fix ambiguous specializations.
	* testsuite/20_util/function_objects/comparisons_pointer.cc: Add
	tests for type with overlaoded operators.

From-SVN: r258773
parent ece7d31f
Showing with 79 additions and 40 deletions
libstdc++-v3/ChangeLog
2018-03-22 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/85040
* include/bits/stl_function.h (greater::__not_overloaded)
(less::__not_overloaded, greater_equal::__not_overloaded)
(less_equal::__not_overloaded): Fix ambiguous specializations.
* testsuite/20_util/function_objects/comparisons_pointer.cc: Add
tests for type with overlaoded operators.
2018-03-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libstdc++/77691
......
libstdc++-v3/include/bits/stl_function.h
......@@ -523,15 +523,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static_cast<const volatile void*>(std::forward<_Up>(__u)));
}
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded;
// False if we can call operator>(T,U)
template<typename _Tp, typename _Up>
struct __not_overloaded<_Tp, _Up, __void_t<
decltype(operator>(std::declval<_Tp>(), std::declval<_Up>()))>>
: false_type { };
// True if there is no viable operator> member function.
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded2 : true_type { };
......@@ -541,8 +533,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
decltype(std::declval<_Tp>().operator>(std::declval<_Up>()))>>
: false_type { };
// True if there is no overloaded operator> for these operands.
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded : __not_overloaded2<_Tp, _Up> { };
// False if we can call operator>(T,U)
template<typename _Tp, typename _Up>
struct __not_overloaded<_Tp, _Up> : __not_overloaded2<_Tp, _Up> { };
struct __not_overloaded<_Tp, _Up, __void_t<
decltype(operator>(std::declval<_Tp>(), std::declval<_Up>()))>>
: false_type { };
template<typename _Tp, typename _Up>
using __ptr_cmp = __and_<__not_overloaded<_Tp, _Up>,
......@@ -586,15 +585,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static_cast<const volatile void*>(std::forward<_Up>(__u)));
}
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded;
// False if we can call operator<(T,U)
template<typename _Tp, typename _Up>
struct __not_overloaded<_Tp, _Up, __void_t<
decltype(operator<(std::declval<_Tp>(), std::declval<_Up>()))>>
: false_type { };
// True if there is no viable operator< member function.
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded2 : true_type { };
......@@ -604,8 +595,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
decltype(std::declval<_Tp>().operator<(std::declval<_Up>()))>>
: false_type { };
// True if there is no overloaded operator< for these operands.
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded : __not_overloaded2<_Tp, _Up> { };
// False if we can call operator<(T,U)
template<typename _Tp, typename _Up>
struct __not_overloaded<_Tp, _Up> : __not_overloaded2<_Tp, _Up> { };
struct __not_overloaded<_Tp, _Up, __void_t<
decltype(operator<(std::declval<_Tp>(), std::declval<_Up>()))>>
: false_type { };
template<typename _Tp, typename _Up>
using __ptr_cmp = __and_<__not_overloaded<_Tp, _Up>,
......@@ -649,15 +647,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static_cast<const volatile void*>(std::forward<_Up>(__u)));
}
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded;
// False if we can call operator>=(T,U)
template<typename _Tp, typename _Up>
struct __not_overloaded<_Tp, _Up, __void_t<
decltype(operator>=(std::declval<_Tp>(), std::declval<_Up>()))>>
: false_type { };
// True if there is no viable operator>= member function.
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded2 : true_type { };
......@@ -667,8 +657,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
decltype(std::declval<_Tp>().operator>=(std::declval<_Up>()))>>
: false_type { };
// True if there is no overloaded operator>= for these operands.
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded : __not_overloaded2<_Tp, _Up> { };
// False if we can call operator>=(T,U)
template<typename _Tp, typename _Up>
struct __not_overloaded<_Tp, _Up> : __not_overloaded2<_Tp, _Up> { };
struct __not_overloaded<_Tp, _Up, __void_t<
decltype(operator>=(std::declval<_Tp>(), std::declval<_Up>()))>>
: false_type { };
template<typename _Tp, typename _Up>
using __ptr_cmp = __and_<__not_overloaded<_Tp, _Up>,
......@@ -712,15 +709,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static_cast<const volatile void*>(std::forward<_Up>(__u)));
}
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded;
// False if we can call operator<=(T,U)
template<typename _Tp, typename _Up>
struct __not_overloaded<_Tp, _Up, __void_t<
decltype(operator<=(std::declval<_Tp>(), std::declval<_Up>()))>>
: false_type { };
// True if there is no viable operator<= member function.
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded2 : true_type { };
......@@ -730,8 +719,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
decltype(std::declval<_Tp>().operator<=(std::declval<_Up>()))>>
: false_type { };
// True if there is no overloaded operator<= for these operands.
template<typename _Tp, typename _Up, typename = void>
struct __not_overloaded : __not_overloaded2<_Tp, _Up> { };
// False if we can call operator<=(T,U)
template<typename _Tp, typename _Up>
struct __not_overloaded<_Tp, _Up> : __not_overloaded2<_Tp, _Up> { };
struct __not_overloaded<_Tp, _Up, __void_t<
decltype(operator<=(std::declval<_Tp>(), std::declval<_Up>()))>>
: false_type { };
template<typename _Tp, typename _Up>
using __ptr_cmp = __and_<__not_overloaded<_Tp, _Up>,
......
libstdc++-v3/testsuite/20_util/function_objects/comparisons_pointer.cc
......@@ -195,6 +195,39 @@ test05()
#endif
}
struct Overloaded {
bool operator>(int) { return true; }
bool operator<(int) { return false; }
bool operator>=(int) { return true; }
bool operator<=(int) { return false; }
};
bool operator>(Overloaded, Overloaded) { return false; }
bool operator<(Overloaded, Overloaded) { return false; }
bool operator>=(Overloaded, Overloaded) { return true; }
bool operator<=(Overloaded, Overloaded) { return true; }
void
test06()
{
#if __cplusplus >= 201402L
std::greater<void> gt;
std::less<void> lt;
std::greater_equal<void> ge;
std::less_equal<void> le;
Overloaded o;
VERIFY( !gt(o, o) );
VERIFY( !lt(o, o) );
VERIFY( ge(o, o) );
VERIFY( le(o, o) );
VERIFY( gt(o, 1) );
VERIFY( !lt(o, 1) );
VERIFY( ge(o, 1) );
VERIFY( !le(o, 1) );
#endif
}
int
main()
{
......@@ -203,4 +236,5 @@ main()
test03();
test04();
test05();
test06();
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment