From 3e98f4c537a49da1c5ad9a8cc18459f806eb9f98 Mon Sep 17 00:00:00 2001
From: John Wellbelove <jwellbelove@users.noreply.github.com>
Date: Sun, 21 Nov 2021 16:45:37 +0000
Subject: [PATCH] Fixes for Ubuntu 18

---
 include/etl/deque.h |  2 +-
 test/test_deque.cpp | 24 ++++++------------------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/include/etl/deque.h b/include/etl/deque.h
index 3f9827de..2886e9e8 100644
--- a/include/etl/deque.h
+++ b/include/etl/deque.h
@@ -2452,7 +2452,7 @@ namespace etl
   //*************************************************************************
 #if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST
   template <typename... T>
-  deque(T...) -> deque<int, sizeof...(T)>;
+  deque(T...) -> deque<typename etl::common_type_t<T...>, sizeof...(T)>;
 #endif
 
   //*************************************************************************
diff --git a/test/test_deque.cpp b/test/test_deque.cpp
index 186f2fe5..73fcd195 100644
--- a/test/test_deque.cpp
+++ b/test/test_deque.cpp
@@ -101,32 +101,20 @@ namespace
       CHECK_EQUAL(SIZE, data.max_size());
     }
 
-#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED)
+#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) && !defined(ETL_COMPILER_GCC)
     //*************************************************************************
     TEST(test_cpp17_deduced_constructor)
     {
-      //etl::deque data{ N0, N1, N2, N3, N4, N5, N6, N7, N8, N9, N10, N11, N12, N13 };
-      //etl::deque<NDC, 14> check = { N0, N1, N2, N3, N4, N5, N6, N7, N8, N9, N10, N11, N12, N13 };
-
-      //CHECK(!data.empty());
-      //CHECK(data.full());
-      //CHECK(data.begin() != data.end());
-      //CHECK_EQUAL(14U, data.size());
-      //CHECK_EQUAL(0U, data.available());
-      //CHECK_EQUAL(14U, data.capacity());
-      //CHECK_EQUAL(14U, data.max_size());
-      //CHECK(data == check);
-
-      etl::deque data{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-      etl::deque<int, 10U> check = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+      etl::deque data{ N0, N1, N2, N3, N4, N5, N6, N7, N8, N9, N10, N11, N12, N13 };
+      etl::deque<NDC, 14> check = { N0, N1, N2, N3, N4, N5, N6, N7, N8, N9, N10, N11, N12, N13 };
 
       CHECK(!data.empty());
       CHECK(data.full());
       CHECK(data.begin() != data.end());
+      CHECK_EQUAL(14U, data.size());
       CHECK_EQUAL(0U, data.available());
-      CHECK_EQUAL(10U, data.capacity());
-      CHECK_EQUAL(10U, data.size());
-      CHECK_EQUAL(10U, data.max_size());
+      CHECK_EQUAL(14U, data.capacity());
+      CHECK_EQUAL(14U, data.max_size());
       CHECK(data == check);
     }
 #endif