extra stable_vector fixes

Author: MAIPA01

mstd/include/containers/mstd/stable_vector.hpp

@@ -517,42 +517,36 @@ namespace mstd {
 
 		[[nodiscard]] const value_type* data() const { return _data.data(); }
 
-		[[nodiscard]] _MSTD_CONSTEXPR20 bool operator==(const stable_vector& other) const
-		#if _MSTD_HAS_CXX20
-		  = default;
-		#else
-		{
+		[[nodiscard]] _MSTD_CONSTEXPR20 bool operator==(const stable_vector& other) const {
 			return _data == other._data && _toId == other._toId && _toData == other._toData;
 		}
-		#endif
 
-		[[nodiscard]] _MSTD_CONSTEXPR20 bool operator!=(const stable_vector& other) const
-		#if _MSTD_HAS_CXX20
-		  = default;
-		#else
-		{
-			return !(*this == other);
-		}
-		#endif
+		[[nodiscard]] _MSTD_CONSTEXPR20 bool operator!=(const stable_vector& other) const { return !(*this == other); }
 
 		#if _MSTD_HAS_CXX20
-		[[nodiscard]] _MSTD_CONSTEXPR20 auto operator<=>(const stable_vector& other) const = default;
-		#else
-		[[nodiscard]] _MSTD_CONSTEXPR20 bool operator<(const stable_vector& other) const {
-			return _data < other._data && _toId < other._toId && _toData < other._toData;
-		}
+		[[nodiscard]] constexpr auto operator<=>(const stable_vector& other) const {
+				if (auto cmp = _data <=> other._data; cmp != 0) { return cmp; }
 
-		[[nodiscard]] _MSTD_CONSTEXPR20 bool operator<=(const stable_vector& other) const {
-			return _data <= other._data && _toId <= other._toId && _toData <= other._toData;
-		}
+				if (auto cmp = _toId <=> other._toId; cmp != 0) { return cmp; }
 
-		[[nodiscard]] _MSTD_CONSTEXPR20 bool operator>(const stable_vector& other) const {
-			return _data > other._data && _toId > other._toId && _toData > other._toData;
+			return _toData <=> other._toData;
 		}
+		#else
+		[[nodiscard]] bool operator<(const stable_vector& other) const {
+				if (_data < other._data) { return true; }
+				if (other._data < _data) { return false; }
+
+				if (_toId < other._toId) { return true; }
+				if (other._toId < _toId) { return false; }
 
-		[[nodiscard]] _MSTD_CONSTEXPR20 bool operator>=(const stable_vector& other) const {
-			return _data >= other._data && _toId >= other._toId && _toData >= other._toData;
+			return _toData < other._toData;
 		}
+
+		[[nodiscard]] bool operator<=(const stable_vector& other) const { return !(other < *this); }
+
+		[[nodiscard]] bool operator>(const stable_vector& other) const { return other < *this; }
+
+		[[nodiscard]] bool operator>=(const stable_vector& other) const { return !(*this < other); }
 		#endif
 	};
 } // namespace mstd

tests/containers/stable_vector_tests.cpp

@@ -652,20 +652,9 @@ namespace mstd::test {
 		mstd::stable_vector<int> c2 = { 1, 2, 4 };
 		mstd::stable_vector<int> c3 = { 1, 2, 3, 4 };
 
-		#if _MSTD_HAS_CXX20
 		EXPECT_TRUE(c1 < c2);  // 3 < 4
-		#else
-		EXPECT_FALSE(c1 < c2);
-		#endif
-
 		EXPECT_TRUE(c1 <= c2);
-
-		#if _MSTD_HAS_CXX20
 		EXPECT_TRUE(c2 > c1);
-		#else
-		EXPECT_FALSE(c2 > c1);
-		#endif
-
 		EXPECT_TRUE(c2 >= c1);
 		EXPECT_TRUE(c1 < c3); // c1 is shorter
 	}