From bb628aa25d7c0d6205bbabe62c6f43b52be3af97 Mon Sep 17 00:00:00 2001
From: John Wellbelove <john.wellbelove@asterconsulting.co.uk>
Date: Thu, 4 Sep 2025 15:00:22 +0100
Subject: [PATCH] Attempted fixes for MacOS compilation

---
 test/test_const_multiset.cpp               | 2 +-
 test/test_const_multiset_constexpr.cpp     | 2 ++
 test/test_const_multiset_ext.cpp           | 2 +-
 test/test_const_multiset_ext_constexpr.cpp | 2 +-
 test/test_const_set.cpp                    | 2 ++
 test/test_const_set_ext.cpp                | 2 ++
 test/test_const_set_ext_constexpr.cpp      | 2 ++
 7 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/test_const_multiset.cpp b/test/test_const_multiset.cpp
index cc59d41d..b5102738 100644
--- 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
index af7fcb71..95dc2db7 100644
--- 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
index 781ce4e6..6574eff2 100644
--- 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
index e678214a..2cff9b54 100644
--- 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
index c923a3e2..06ed6b44 100644
--- 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
index b96fffb4..d9d194c0 100644
--- 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
index 8362e8ea..ab5bd491 100644
--- 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