changed to return strong ordering results

Author: AnjuDel

stl/inc/xstring

@@ -4622,11 +4622,23 @@ _NODISCARD bool operator>=(const basic_string<_Elem, _Traits, _Alloc>& _Left, _I
 template <class _Elem, class _Traits, class _Alloc>
 _NODISCARD strong_ordering operator<=>(
     const basic_string<_Elem, _Traits, _Alloc>& _Left, const basic_string<_Elem, _Traits, _Alloc>& _Right) noexcept {
-    return _Left.compare(_Right);
+    int _comparison = _Left.compare(_Right);
+    if (_comparison == 0) {
+        return strong_ordering::equivalent;
+    } else if (_comparison < 0) {
+        return strong_ordering::less;
+    }
+    return strong_ordering::greater;
 }
 template <class _Elem, class _Traits, class _Alloc>
 _NODISCARD strong_ordering operator<=>(const basic_string<_Elem, _Traits, _Alloc>& _Left, const _Elem* _Right) {
-    return _Left.compare(_Right);
+    int _comparison = _Left.compare(_Right);
+    if (_comparison == 0) {
+        return strong_ordering::equivalent;
+    } else if (_comparison < 0) {
+        return strong_ordering::less;
+    }
+    return strong_ordering::greater;
 }
 #endif // _HAS_CXX20
 

tests/std/tests/P1614R2_spaceship/test.cpp

@@ -462,11 +462,11 @@ void ordering_test_cases() {
         std::string a5 = "abddef";
         std::string a6 = "abbdef";
 
-        assert((a1 <=> a2) == 0);
-        assert((a1 <=> a3) == -1);
-        assert((a1 <=> a4) == 1);
-        assert((a1 <=> a5) == -1);
-        assert((a1 <=> a6) == 1);
+        assert((a1 <=> a2) == std::strong_ordering::equivalent);
+        assert((a1 <=> a3) == std::strong_ordering::less);
+        assert((a1 <=> a4) == std::strong_ordering::greater);
+        assert((a1 <=> a5) == std::strong_ordering::less);
+        assert((a1 <=> a6) == std::strong_ordering::greater);
 
         assert(a1 == a2);
         assert(a1 >= a2);