Attempted fixes for MacOS compilation

John Wellbelove · John Wellbelove · commit bb628aa25d7c · 2025-09-04T15:00:22.000+01:00
diff --git a/test/test_const_multiset.cpp b/test/test_const_multiset.cpp
@@ -85,7 +85,7 @@ namespace
     return (lhs.k == rhs.k);
   }
 
-#if ETL_NOT_USING_CPP23
+#if ETL_NOT_USING_CPP20
   // Equality operator for Key != Key
   constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept
   {
diff --git a/test/test_const_multiset_constexpr.cpp b/test/test_const_multiset_constexpr.cpp
@@ -87,11 +87,13 @@ namespace
     return (lhs.k == rhs.k);
   }
 
+#if ETL_NOT_USING_CPP20
   // Equality operator for Key != Key
   constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept
   {
     return !(lhs.k == rhs.k);
   }
+#endif
 
 #define TEST_GREATER_THAN
 #ifdef TEST_GREATER_THAN
diff --git a/test/test_const_multiset_ext.cpp b/test/test_const_multiset_ext.cpp
@@ -86,7 +86,7 @@ namespace
     return (lhs.k == rhs.k);
   }
 
-#if ETL_NOT_USING_CPP23
+#if ETL_NOT_USING_CPP20
   // Equality operator for Key != Key
   constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept
   {
diff --git a/test/test_const_multiset_ext_constexpr.cpp b/test/test_const_multiset_ext_constexpr.cpp
@@ -88,7 +88,7 @@ namespace
     return (lhs.k == rhs.k);
   }
 
-#if ETL_NOT_USING_CPP23
+#if ETL_NOT_USING_CPP20
   // Equality operator for Key != Key
   constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept
   {
diff --git a/test/test_const_set.cpp b/test/test_const_set.cpp
@@ -83,11 +83,13 @@ namespace
     return (lhs.k == rhs.k);
   }
 
+#if ETL_NOT_USING_CPP20
   // Equality operator for Key != Key
   constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept
   {
     return !(lhs.k == rhs.k);
   }
+#endif
 
   #define TEST_GREATER_THAN
   #ifdef TEST_GREATER_THAN
diff --git a/test/test_const_set_ext.cpp b/test/test_const_set_ext.cpp
@@ -89,11 +89,13 @@ namespace
     return (lhs.k == rhs.k);
   }
 
+#if ETL_NOT_USING_CPP20
   // Equality operator for Key != Key
   constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept
   {
     return !(lhs.k == rhs.k);
   }
+#endif
 
   #define TEST_GREATER_THAN
   #ifdef TEST_GREATER_THAN
diff --git a/test/test_const_set_ext_constexpr.cpp b/test/test_const_set_ext_constexpr.cpp
@@ -91,11 +91,13 @@ namespace
     return (lhs.k == rhs.k);
   }
 
+#if ETL_NOT_USING_CPP20
   // Equality operator for Key != Key
   constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept
   {
     return !(lhs.k == rhs.k);
   }
+#endif
 
   #define TEST_GREATER_THAN
   #ifdef TEST_GREATER_THAN

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ namespace`
`85`	`85`	`return (lhs.k == rhs.k);`
`86`	`86`	`}`
`87`	`87`
`88`		`-#if ETL_NOT_USING_CPP23`
	`88`	`+#if ETL_NOT_USING_CPP20`
`89`	`89`	`// Equality operator for Key != Key`
`90`	`90`	`constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept`
`91`	`91`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,11 +87,13 @@ namespace`
`87`	`87`	`return (lhs.k == rhs.k);`
`88`	`88`	`}`
`89`	`89`
	`90`	`+#if ETL_NOT_USING_CPP20`
`90`	`91`	`// Equality operator for Key != Key`
`91`	`92`	`constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept`
`92`	`93`	`{`
`93`	`94`	`return !(lhs.k == rhs.k);`
`94`	`95`	`}`
	`96`	`+#endif`
`95`	`97`
`96`	`98`	`#define TEST_GREATER_THAN`
`97`	`99`	`#ifdef TEST_GREATER_THAN`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ namespace`
`86`	`86`	`return (lhs.k == rhs.k);`
`87`	`87`	`}`
`88`	`88`
`89`		`-#if ETL_NOT_USING_CPP23`
	`89`	`+#if ETL_NOT_USING_CPP20`
`90`	`90`	`// Equality operator for Key != Key`
`91`	`91`	`constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept`
`92`	`92`	`{`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ namespace`
`88`	`88`	`return (lhs.k == rhs.k);`
`89`	`89`	`}`
`90`	`90`
`91`		`-#if ETL_NOT_USING_CPP23`
	`91`	`+#if ETL_NOT_USING_CPP20`
`92`	`92`	`// Equality operator for Key != Key`
`93`	`93`	`constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,13 @@ namespace`
`83`	`83`	`return (lhs.k == rhs.k);`
`84`	`84`	`}`
`85`	`85`
	`86`	`+#if ETL_NOT_USING_CPP20`
`86`	`87`	`// Equality operator for Key != Key`
`87`	`88`	`constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept`
`88`	`89`	`{`
`89`	`90`	`return !(lhs.k == rhs.k);`
`90`	`91`	`}`
	`92`	`+#endif`
`91`	`93`
`92`	`94`	`#define TEST_GREATER_THAN`
`93`	`95`	`#ifdef TEST_GREATER_THAN`
Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,13 @@ namespace`
`89`	`89`	`return (lhs.k == rhs.k);`
`90`	`90`	`}`
`91`	`91`
	`92`	`+#if ETL_NOT_USING_CPP20`
`92`	`93`	`// Equality operator for Key != Key`
`93`	`94`	`constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept`
`94`	`95`	`{`
`95`	`96`	`return !(lhs.k == rhs.k);`
`96`	`97`	`}`
	`98`	`+#endif`
`97`	`99`
`98`	`100`	`#define TEST_GREATER_THAN`
`99`	`101`	`#ifdef TEST_GREATER_THAN`
Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,13 @@ namespace`
`91`	`91`	`return (lhs.k == rhs.k);`
`92`	`92`	`}`
`93`	`93`
	`94`	`+#if ETL_NOT_USING_CPP20`
`94`	`95`	`// Equality operator for Key != Key`
`95`	`96`	`constexpr bool operator !=(const Key& lhs, const Key& rhs) noexcept`
`96`	`97`	`{`
`97`	`98`	`return !(lhs.k == rhs.k);`
`98`	`99`	`}`
	`100`	`+#endif`
`99`	`101`
`100`	`102`	`#define TEST_GREATER_THAN`
`101`	`103`	`#ifdef TEST_GREATER_THAN`