diff --git a/stl/inc/compare b/stl/inc/compare index 0604144a042..60121669df9 100644 --- a/stl/inc/compare +++ b/stl/inc/compare @@ -322,7 +322,7 @@ struct compare_three_way_result<_Ty1, _Ty2> { struct compare_three_way { template - requires three_way_comparable_with<_Ty1, _Ty2> // TRANSITION, GH-489 + requires three_way_comparable_with<_Ty1, _Ty2> _NODISCARD constexpr auto operator()(_Ty1&& _Left, _Ty2&& _Right) const noexcept(noexcept(_STD forward<_Ty1>(_Left) <=> _STD forward<_Ty2>(_Right))) /* strengthened */ { return _STD forward<_Ty1>(_Left) <=> _STD forward<_Ty2>(_Right); diff --git a/stl/inc/functional b/stl/inc/functional index 2db14e9137d..878d0438cce 100644 --- a/stl/inc/functional +++ b/stl/inc/functional @@ -2105,7 +2105,7 @@ namespace ranges { struct not_equal_to { // clang-format off template - requires equality_comparable_with<_Ty1, _Ty2> // TRANSITION, GH-489 + requires equality_comparable_with<_Ty1, _Ty2> _NODISCARD constexpr bool operator()(_Ty1&& _Left, _Ty2&& _Right) const noexcept(noexcept( static_cast(static_cast<_Ty1&&>(_Left) == static_cast<_Ty2&&>(_Right)))) /* strengthened */ { return !static_cast(static_cast<_Ty1&&>(_Left) == static_cast<_Ty2&&>(_Right)); @@ -2118,7 +2118,7 @@ namespace ranges { struct greater_equal { // clang-format off template - requires totally_ordered_with<_Ty1, _Ty2> // TRANSITION, GH-489 + requires totally_ordered_with<_Ty1, _Ty2> _NODISCARD constexpr bool operator()(_Ty1&& _Left, _Ty2&& _Right) const noexcept(noexcept( static_cast(static_cast<_Ty1&&>(_Left) < static_cast<_Ty2&&>(_Right)))) /* strengthened */ { return !static_cast(static_cast<_Ty1&&>(_Left) < static_cast<_Ty2&&>(_Right)); @@ -2131,7 +2131,7 @@ namespace ranges { struct less_equal { // clang-format off template - requires totally_ordered_with<_Ty1, _Ty2> // TRANSITION, GH-489 + requires totally_ordered_with<_Ty1, _Ty2> _NODISCARD constexpr bool operator()(_Ty1&& _Left, _Ty2&& _Right) const noexcept(noexcept( static_cast(static_cast<_Ty2&&>(_Right) < static_cast<_Ty1&&>(_Left)))) /* strengthened */ { return !static_cast(static_cast<_Ty2&&>(_Right) < static_cast<_Ty1&&>(_Left)); diff --git a/stl/inc/system_error b/stl/inc/system_error index 911f9fbface..afb894fee87 100644 --- a/stl/inc/system_error +++ b/stl/inc/system_error @@ -96,7 +96,6 @@ public: } #endif // !_HAS_CXX20 -// TRANSITION, GH-489 #ifdef __cpp_lib_concepts _NODISCARD strong_ordering operator<=>(const error_category& _Right) const noexcept { return compare_three_way{}(_Addr, _Right._Addr); @@ -181,7 +180,6 @@ public: return _System_error_equal(_Left, _Right); } -// TRANSITION, GH-489 #ifdef __cpp_lib_concepts _NODISCARD friend strong_ordering operator<=>(const error_code& _Left, const error_code& _Right) noexcept { if (const auto _Result = _Left.category() <=> _Right.category(); _Result != 0) { @@ -267,7 +265,6 @@ public: return _Left.category() == _Right.category() && _Left.value() == _Right.value(); } -// TRANSITION, GH-489 #ifdef __cpp_lib_concepts _NODISCARD friend strong_ordering operator<=>( const error_condition& _Left, const error_condition& _Right) noexcept { @@ -321,7 +318,6 @@ _NODISCARD inline bool operator==(const error_condition& _Left, const error_cond return _Left.category() == _Right.category() && _Left.value() == _Right.value(); } -// TRANSITION, GH-489 #ifdef __cpp_lib_concepts _NODISCARD inline strong_ordering operator<=>(const error_code& _Left, const error_code& _Right) noexcept { if (const auto _Result = _Left.category() <=> _Right.category(); _Result != 0) { diff --git a/stl/inc/xutility b/stl/inc/xutility index f8e5f13df53..e267e92ae2c 100644 --- a/stl/inc/xutility +++ b/stl/inc/xutility @@ -2969,7 +2969,7 @@ namespace ranges { struct equal_to { // clang-format off template - requires equality_comparable_with<_Ty1, _Ty2> // TRANSITION, GH-489 + requires equality_comparable_with<_Ty1, _Ty2> _NODISCARD constexpr bool operator()(_Ty1&& _Left, _Ty2&& _Right) const noexcept(noexcept( static_cast(static_cast<_Ty1&&>(_Left) == static_cast<_Ty2&&>(_Right)))) /* strengthened */ { return static_cast(static_cast<_Ty1&&>(_Left) == static_cast<_Ty2&&>(_Right)); @@ -2982,7 +2982,7 @@ namespace ranges { struct less { // clang-format off template - requires totally_ordered_with<_Ty1, _Ty2> // TRANSITION, GH-489 + requires totally_ordered_with<_Ty1, _Ty2> _NODISCARD constexpr bool operator()(_Ty1&& _Left, _Ty2&& _Right) const noexcept(noexcept( static_cast(static_cast<_Ty1&&>(_Left) < static_cast<_Ty2&&>(_Right)))) /* strengthened */ { return static_cast(static_cast<_Ty1&&>(_Left) < static_cast<_Ty2&&>(_Right)); @@ -2995,7 +2995,7 @@ namespace ranges { struct greater { // clang-format off template - requires totally_ordered_with<_Ty1, _Ty2> // TRANSITION, GH-489 + requires totally_ordered_with<_Ty1, _Ty2> _NODISCARD constexpr bool operator()(_Ty1&& _Left, _Ty2&& _Right) const noexcept(noexcept( static_cast(static_cast<_Ty2&&>(_Right) < static_cast<_Ty1&&>(_Left)))) /* strengthened */ { return static_cast(static_cast<_Ty2&&>(_Right) < static_cast<_Ty1&&>(_Left));