diff --git a/libcxx/include/compare b/libcxx/include/compare --- a/libcxx/include/compare +++ b/libcxx/include/compare @@ -43,6 +43,84 @@ template constexpr partial_ordering partial_order(const T& a, const T& b); template constexpr strong_equality strong_equal(const T& a, const T& b); template constexpr weak_equality weak_equal(const T& a, const T& b); + + // [cmp.partialord], Class partial_ordering + class partial_ordering { + public: + // valid values + static const partial_ordering less; + static const partial_ordering equivalent; + static const partial_ordering greater; + static const partial_ordering unordered; + + // comparisons + friend constexpr bool operator==(partial_ordering v, unspecified) noexcept; + friend constexpr bool operator==(partial_ordering v, partial_ordering w) noexcept = default; + friend constexpr bool operator< (partial_ordering v, unspecified) noexcept; + friend constexpr bool operator> (partial_ordering v, unspecified) noexcept; + friend constexpr bool operator<=(partial_ordering v, unspecified) noexcept; + friend constexpr bool operator>=(partial_ordering v, unspecified) noexcept; + friend constexpr bool operator< (unspecified, partial_ordering v) noexcept; + friend constexpr bool operator> (unspecified, partial_ordering v) noexcept; + friend constexpr bool operator<=(unspecified, partial_ordering v) noexcept; + friend constexpr bool operator>=(unspecified, partial_ordering v) noexcept; + friend constexpr partial_ordering operator<=>(partial_ordering v, unspecified) noexcept; + friend constexpr partial_ordering operator<=>(unspecified, partial_ordering v) noexcept; + }; + + // [cmp.weakord], Class weak_ordering + class weak_ordering { + public: + // valid values + static const weak_ordering less; + static const weak_ordering equivalent; + static const weak_ordering greater; + + // conversions + constexpr operator partial_ordering() const noexcept; + + // comparisons + friend constexpr bool operator==(weak_ordering v, unspecified) noexcept; + friend constexpr bool operator==(weak_ordering v, weak_ordering w) noexcept = default; + friend constexpr bool operator< (weak_ordering v, unspecified) noexcept; + friend constexpr bool operator> (weak_ordering v, unspecified) noexcept; + friend constexpr bool operator<=(weak_ordering v, unspecified) noexcept; + friend constexpr bool operator>=(weak_ordering v, unspecified) noexcept; + friend constexpr bool operator< (unspecified, weak_ordering v) noexcept; + friend constexpr bool operator> (unspecified, weak_ordering v) noexcept; + friend constexpr bool operator<=(unspecified, weak_ordering v) noexcept; + friend constexpr bool operator>=(unspecified, weak_ordering v) noexcept; + friend constexpr weak_ordering operator<=>(weak_ordering v, unspecified) noexcept; + friend constexpr weak_ordering operator<=>(unspecified, weak_ordering v) noexcept; + }; + + // [cmp.strongord], Class strong_ordering + class strong_ordering { + public: + // valid values + static const strong_ordering less; + static const strong_ordering equal; + static const strong_ordering equivalent; + static const strong_ordering greater; + + // conversions + constexpr operator partial_ordering() const noexcept; + constexpr operator weak_ordering() const noexcept; + + // comparisons + friend constexpr bool operator==(strong_ordering v, unspecified) noexcept; + friend constexpr bool operator==(strong_ordering v, strong_ordering w) noexcept = default; + friend constexpr bool operator< (strong_ordering v, unspecified) noexcept; + friend constexpr bool operator> (strong_ordering v, unspecified) noexcept; + friend constexpr bool operator<=(strong_ordering v, unspecified) noexcept; + friend constexpr bool operator>=(strong_ordering v, unspecified) noexcept; + friend constexpr bool operator< (unspecified, strong_ordering v) noexcept; + friend constexpr bool operator> (unspecified, strong_ordering v) noexcept; + friend constexpr bool operator<=(unspecified, strong_ordering v) noexcept; + friend constexpr bool operator>=(unspecified, strong_ordering v) noexcept; + friend constexpr strong_ordering operator<=>(strong_ordering v, unspecified) noexcept; + friend constexpr strong_ordering operator<=>(unspecified, strong_ordering v) noexcept; + }; } */ @@ -248,6 +326,8 @@ _LIBCPP_INLINE_VISIBILITY friend constexpr bool operator>=(_CmpUnspecifiedParam, partial_ordering __v) noexcept; #ifndef _LIBCPP_HAS_NO_SPACESHIP_OPERATOR + _LIBCPP_INLINE_VISIBILITY friend constexpr bool operator==(partial_ordering, partial_ordering) noexcept = default; + _LIBCPP_INLINE_VISIBILITY friend constexpr partial_ordering operator<=>(partial_ordering __v, _CmpUnspecifiedParam) noexcept; _LIBCPP_INLINE_VISIBILITY friend constexpr partial_ordering operator<=>(_CmpUnspecifiedParam, partial_ordering __v) noexcept; #endif @@ -364,6 +444,8 @@ _LIBCPP_INLINE_VISIBILITY friend constexpr bool operator>=(_CmpUnspecifiedParam, weak_ordering __v) noexcept; #ifndef _LIBCPP_HAS_NO_SPACESHIP_OPERATOR + _LIBCPP_INLINE_VISIBILITY friend constexpr bool operator==(weak_ordering, weak_ordering) noexcept = default; + _LIBCPP_INLINE_VISIBILITY friend constexpr weak_ordering operator<=>(weak_ordering __v, _CmpUnspecifiedParam) noexcept; _LIBCPP_INLINE_VISIBILITY friend constexpr weak_ordering operator<=>(_CmpUnspecifiedParam, weak_ordering __v) noexcept; #endif @@ -490,6 +572,8 @@ _LIBCPP_INLINE_VISIBILITY friend constexpr bool operator>=(_CmpUnspecifiedParam, strong_ordering __v) noexcept; #ifndef _LIBCPP_HAS_NO_SPACESHIP_OPERATOR + _LIBCPP_INLINE_VISIBILITY friend constexpr bool operator==(strong_ordering, strong_ordering) noexcept = default; + _LIBCPP_INLINE_VISIBILITY friend constexpr strong_ordering operator<=>(strong_ordering __v, _CmpUnspecifiedParam) noexcept; _LIBCPP_INLINE_VISIBILITY friend constexpr strong_ordering operator<=>(_CmpUnspecifiedParam, strong_ordering __v) noexcept; #endif diff --git a/libcxx/test/std/language.support/cmp/cmp.partialord/partialord.pass.cpp b/libcxx/test/std/language.support/cmp/cmp.partialord/partialord.pass.cpp --- a/libcxx/test/std/language.support/cmp/cmp.partialord/partialord.pass.cpp +++ b/libcxx/test/std/language.support/cmp/cmp.partialord/partialord.pass.cpp @@ -150,6 +150,42 @@ break; } } + { + static_assert(std::partial_ordering::less == std::partial_ordering::less); + static_assert(std::partial_ordering::less != + std::partial_ordering::equivalent); + static_assert(std::partial_ordering::less != + std::partial_ordering::greater); + static_assert(std::partial_ordering::less != + std::partial_ordering::unordered); + + static_assert(std::partial_ordering::equivalent != + std::partial_ordering::less); + static_assert(std::partial_ordering::equivalent == + std::partial_ordering::equivalent); + static_assert(std::partial_ordering::equivalent != + std::partial_ordering::greater); + static_assert(std::partial_ordering::equivalent != + std::partial_ordering::unordered); + + static_assert(std::partial_ordering::greater != + std::partial_ordering::less); + static_assert(std::partial_ordering::greater != + std::partial_ordering::equivalent); + static_assert(std::partial_ordering::greater == + std::partial_ordering::greater); + static_assert(std::partial_ordering::greater != + std::partial_ordering::unordered); + + static_assert(std::partial_ordering::unordered != + std::partial_ordering::less); + static_assert(std::partial_ordering::unordered != + std::partial_ordering::equivalent); + static_assert(std::partial_ordering::unordered != + std::partial_ordering::greater); + static_assert(std::partial_ordering::unordered == + std::partial_ordering::unordered); + } #endif return true; diff --git a/libcxx/test/std/language.support/cmp/cmp.strongord/strongord.pass.cpp b/libcxx/test/std/language.support/cmp/cmp.strongord/strongord.pass.cpp --- a/libcxx/test/std/language.support/cmp/cmp.strongord/strongord.pass.cpp +++ b/libcxx/test/std/language.support/cmp/cmp.strongord/strongord.pass.cpp @@ -198,6 +198,20 @@ break; } } + { + static_assert(std::strong_ordering::less == std::strong_ordering::less); + static_assert(std::strong_ordering::less != std::strong_ordering::equal); + static_assert(std::strong_ordering::less != std::strong_ordering::greater); + + static_assert(std::strong_ordering::equal != std::strong_ordering::less); + static_assert(std::strong_ordering::equal == std::strong_ordering::equal); + static_assert(std::strong_ordering::equal != std::strong_ordering::greater); + + static_assert(std::strong_ordering::greater != std::strong_ordering::less); + static_assert(std::strong_ordering::greater != std::strong_ordering::equal); + static_assert(std::strong_ordering::greater == + std::strong_ordering::greater); + } #endif return true; diff --git a/libcxx/test/std/language.support/cmp/cmp.weakord/weakord.pass.cpp b/libcxx/test/std/language.support/cmp/cmp.weakord/weakord.pass.cpp --- a/libcxx/test/std/language.support/cmp/cmp.weakord/weakord.pass.cpp +++ b/libcxx/test/std/language.support/cmp/cmp.weakord/weakord.pass.cpp @@ -155,6 +155,23 @@ break; } } + + { + static_assert(std::weak_ordering::less == std::weak_ordering::less); + static_assert(std::weak_ordering::less != std::weak_ordering::equivalent); + static_assert(std::weak_ordering::less != std::weak_ordering::greater); + + static_assert(std::weak_ordering::equivalent != std::weak_ordering::less); + static_assert(std::weak_ordering::equivalent == + std::weak_ordering::equivalent); + static_assert(std::weak_ordering::equivalent != + std::weak_ordering::greater); + + static_assert(std::weak_ordering::greater != std::weak_ordering::less); + static_assert(std::weak_ordering::greater != + std::weak_ordering::equivalent); + static_assert(std::weak_ordering::greater == std::weak_ordering::greater); + } #endif return true; diff --git a/libcxx/www/cxx2a_status.html b/libcxx/www/cxx2a_status.html --- a/libcxx/www/cxx2a_status.html +++ b/libcxx/www/cxx2a_status.html @@ -182,7 +182,7 @@ P1522LWGIterator Difference Type and Integer OverflowCologne P1523LWGViews and Size TypesCologne P1612LWGRelocate Endian’s SpecificationCologneComplete10.0 - P1614LWGThe Mothership has LandedCologne + P1614LWGThe Mothership has LandedCologneIn progress P1638LWGbasic_istream_view::iterator should not be copyableCologne P1643LWGAdd wait/notify to atomic_refCologne P1644LWGAdd wait/notify to atomicCologne