From 9931339605511ab4641fcd7bf47293a17bd551fa Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Sun, 21 Nov 2021 18:31:39 +0000
Subject: [PATCH] Fixes for < GCC 8

---
 test/test_array.cpp         | 2 +-
 test/test_deque.cpp         | 2 +-
 test/test_flat_map.cpp      | 2 +-
 test/test_flat_multimap.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_array.cpp b/test/test_array.cpp
index bce57862..e3ed098d 100644
--- a/test/test_array.cpp
+++ b/test/test_array.cpp
@@ -651,7 +651,7 @@ namespace
     }
 
     //*************************************************************************
-#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !(defined(ETL_COMPILER_GCC) && (ETL_COMPILER_VERSION < 8))
+#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED)
     TEST(test_array_template_deduction)
     {
       etl::array data{ char(0), short(1), int(2), long(3), 4, 5, 6, 7, 8, 9 };
diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index 78aa451a..d975a7f6 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -1992,7 +1992,7 @@ namespace
     }
 
     //*************************************************************************
-#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !(defined(ETL_COMPILER_GCC) && (ETL_COMPILER_VERSION < 8))
+#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED)
     TEST(test_deque_template_deduction)
     {
       etl::deque data{ char(0), short(1), int(2), long(3), 4, 5, 6, 7, 8, 9 };
diff --git a/test/test_flat_map.cpp b/test/test_flat_map.cpp
index ec2eaf17..927a30ac 100644
--- a/test/test_flat_map.cpp
+++ b/test/test_flat_map.cpp
@@ -1330,7 +1330,7 @@ namespace
     }
 
     //*************************************************************************
-#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !(defined(ETL_COMPILER_GCC) && (ETL_COMPILER_VERSION < 8))
+#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED)
     TEST(test_flat_map_template_deduction)
     {
       using Pair = ETL_OR_STD::pair<const int, NDC>;
diff --git a/test/test_flat_multimap.cpp b/test/test_flat_multimap.cpp
index a8b9285b..557309d3 100644
--- a/test/test_flat_multimap.cpp
+++ b/test/test_flat_multimap.cpp
@@ -1132,7 +1132,7 @@ namespace
     }
 
     //*************************************************************************
-#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !(defined(ETL_COMPILER_GCC) && (ETL_COMPILER_VERSION < 8))
+#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED)
     TEST(test_flat_multimap_template_deduction)
     {
       using Pair = ETL_OR_STD::pair<const int, NDC>;