From c39ed5af8050bbdb91d6540706c6a257cec53bef Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Mon, 12 Sep 2022 00:00:06 +0100
Subject: [PATCH] Attempt to fix clang CI error

---
 test/test_unordered_map.cpp      | 19 +++----------------
 test/test_unordered_multimap.cpp | 19 +++----------------
 test/test_unordered_multiset.cpp | 18 +++---------------
 test/test_unordered_set.cpp      | 18 +++---------------
 4 files changed, 12 insertions(+), 62 deletions(-)

diff --git a/test/test_unordered_map.cpp b/test/test_unordered_map.cpp
index 221dcfee..1787c4b6 100644
--- a/test/test_unordered_map.cpp
+++ b/test/test_unordered_map.cpp
@@ -417,12 +417,7 @@ namespace
 
       other_data = data;
 
-      bool isEqual = std::equal(data.begin(),
-                                data.end(),
-                                other_data.begin(),
-                                std::equal_to<DataNDC::value_type>());
-
-      CHECK(isEqual);
+      CHECK(data == other_data);
     }
 
     //*************************************************************************
@@ -436,11 +431,7 @@ namespace
 
       idata2 = idata1;
 
-      bool isEqual = etl::equal(data1.begin(),
-                                data1.end(),
-                                data2.begin());
-
-      CHECK(isEqual);
+      CHECK(idata2 == idata1);
     }
 
     //*************************************************************************
@@ -453,11 +444,7 @@ namespace
       other_data = other_data;
 #include "etl/private/diagnostic_pop.h"
 
-      bool isEqual = etl::equal(data.begin(),
-                                data.end(),
-                                other_data.begin());
-
-      CHECK(isEqual);
+      CHECK(data == other_data);
     }
 
     //*************************************************************************
diff --git a/test/test_unordered_multimap.cpp b/test/test_unordered_multimap.cpp
index 66f89276..f05460b5 100644
--- a/test/test_unordered_multimap.cpp
+++ b/test/test_unordered_multimap.cpp
@@ -339,11 +339,7 @@ namespace
 
       other_data = data;
 
-      bool isEqual = etl::equal(data.begin(),
-                                data.end(),
-                                other_data.begin());
-
-      CHECK(isEqual);
+      CHECK(data == other_data);
     }
 
     //*************************************************************************
@@ -357,11 +353,7 @@ namespace
 
       idata2 = idata1;
 
-      bool isEqual = etl::equal(data1.begin(),
-                                data1.end(),
-                                data2.begin());
-
-      CHECK(isEqual);
+      CHECK(data1 == data2);
     }
 
     //*************************************************************************
@@ -374,12 +366,7 @@ namespace
       other_data = other_data;
 #include "etl/private/diagnostic_pop.h" 
 
-
-      bool isEqual = etl::equal(data.begin(),
-                                data.end(),
-                                other_data.begin());
-
-      CHECK(isEqual);
+      CHECK(data == other_data);
     }
 
     //*************************************************************************
diff --git a/test/test_unordered_multiset.cpp b/test/test_unordered_multiset.cpp
index b15236db..524427b5 100644
--- a/test/test_unordered_multiset.cpp
+++ b/test/test_unordered_multiset.cpp
@@ -283,11 +283,7 @@ namespace
 
       other_data = data;
 
-      bool isEqual = etl::equal(data.begin(),
-                                data.end(),
-                                other_data.begin());
-
-      CHECK(isEqual);
+      CHECK(data == other_data);
     }
 
     //*************************************************************************
@@ -301,11 +297,7 @@ namespace
 
       idata2 = idata1;
 
-      bool isEqual = etl::equal(data1.begin(),
-                                data1.end(),
-                                data2.begin());
-
-      CHECK(isEqual);
+      CHECK(data1 == data2);
     }
 
     //*************************************************************************
@@ -318,11 +310,7 @@ namespace
       other_data = other_data;
 #include "etl/private/diagnostic_pop.h" 
 
-      bool isEqual = etl::equal(data.begin(),
-                                data.end(),
-                                other_data.begin());
-
-      CHECK(isEqual);
+      CHECK(data == other_data);
     }
 
     //*************************************************************************
diff --git a/test/test_unordered_set.cpp b/test/test_unordered_set.cpp
index c45caaa1..b5a1a246 100644
--- a/test/test_unordered_set.cpp
+++ b/test/test_unordered_set.cpp
@@ -267,11 +267,7 @@ namespace
 
       other_data = data;
 
-      bool isEqual = etl::equal(data.begin(),
-                                data.end(),
-                                other_data.begin());
-
-      CHECK(isEqual);
+      CHECK(data == other_data);
     }
 
     //*************************************************************************
@@ -285,11 +281,7 @@ namespace
 
       idata2 = idata1;
 
-      bool isEqual = etl::equal(data1.begin(),
-                                data1.end(),
-                                data2.begin());
-
-      CHECK(isEqual);
+      CHECK(data1 == data2);
     }
 
     //*************************************************************************
@@ -302,11 +294,7 @@ namespace
       other_data = other_data;
 #include "etl/private/diagnostic_pop.h" 
 
-      bool isEqual = etl::equal(data.begin(),
-                                data.end(),
-                                other_data.begin());
-
-      CHECK(isEqual);
+      CHECK(data == other_data);
     }
 
     //*************************************************************************