From 343dabe7e257ae4f8241082477c0d15128f6cb30 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 21 Nov 2021 17:29:56 +0000 Subject: [PATCH] Fixes for < GCC 8 --- test/test_array.cpp | 2 +- test/test_array_view.cpp | 2 +- test/test_circular_buffer.cpp | 4 +++- test/test_circular_buffer_external_buffer.cpp | 4 +++- test/test_flat_map.cpp | 2 +- test/test_flat_multimap.cpp | 4 ++-- test/test_flat_multiset.cpp | 2 +- test/test_flat_set.cpp | 2 +- test/test_forward_list.cpp | 2 +- test/test_indirect_vector.cpp | 2 +- test/test_list.cpp | 2 +- test/test_map.cpp | 2 +- test/test_multimap.cpp | 2 +- test/test_multiset.cpp | 2 +- test/test_set.cpp | 2 +- test/test_span.cpp | 2 +- test/test_unordered_map.cpp | 2 +- test/test_unordered_multimap.cpp | 2 +- test/test_unordered_multiset.cpp | 2 +- test/test_unordered_set.cpp | 2 +- test/test_vector.cpp | 2 +- test/test_vector_non_trivial.cpp | 2 +- test/test_vector_pointer.cpp | 2 +- 23 files changed, 28 insertions(+), 24 deletions(-) diff --git a/test/test_array.cpp b/test/test_array.cpp index f444c1e9..bce57862 100644 --- a/test/test_array.cpp +++ b/test/test_array.cpp @@ -62,7 +62,7 @@ namespace CHECK_EQUAL(data.max_size(), SIZE); } -#if !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_array_view.cpp b/test/test_array_view.cpp index 4b909fc1..6af583df 100644 --- a/test/test_array_view.cpp +++ b/test/test_array_view.cpp @@ -284,7 +284,7 @@ namespace } //************************************************************************* -#if !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) TEST(test_cpp17_deduced_constructor) { etl::array data{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; diff --git a/test/test_circular_buffer.cpp b/test/test_circular_buffer.cpp index ca1d7bca..d44576d8 100644 --- a/test/test_circular_buffer.cpp +++ b/test/test_circular_buffer.cpp @@ -98,7 +98,7 @@ namespace } #endif -#if !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) && ETL_USING_STL +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { @@ -112,8 +112,10 @@ namespace bool isEqual = std::equal(data.begin(), data.end(), compare.begin()); CHECK(isEqual); } +#endif //************************************************************************* +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) TEST(test_cpp17_deduced_constructor_excess) { Data data{ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") }; diff --git a/test/test_circular_buffer_external_buffer.cpp b/test/test_circular_buffer_external_buffer.cpp index 748a3516..04aaa107 100644 --- a/test/test_circular_buffer_external_buffer.cpp +++ b/test/test_circular_buffer_external_buffer.cpp @@ -107,7 +107,7 @@ namespace } #endif -#if !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) && ETL_USING_STL +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { @@ -121,8 +121,10 @@ namespace bool isEqual = std::equal(data.begin(), data.end(), compare.begin()); CHECK(isEqual); } +#endif //************************************************************************* +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) TEST(test_cpp17_deduced_constructor_excess) { Data data({ Ndc("0"), Ndc("1"), Ndc("2"), Ndc("3"), Ndc("4"), Ndc("5"), Ndc("6"), Ndc("7"), Ndc("8"), Ndc("9"), Ndc("10"), Ndc("11"), Ndc("12") }, buffer1.raw, SIZE); diff --git a/test/test_flat_map.cpp b/test/test_flat_map.cpp index e1c6423d..ec2eaf17 100644 --- a/test/test_flat_map.cpp +++ b/test/test_flat_map.cpp @@ -316,7 +316,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_flat_multimap.cpp b/test/test_flat_multimap.cpp index 842f79ee..a8b9285b 100644 --- a/test/test_flat_multimap.cpp +++ b/test/test_flat_multimap.cpp @@ -277,7 +277,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { @@ -1132,7 +1132,7 @@ namespace } //************************************************************************* -#if ETL_USING_INITIALIZER_LIST +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !(defined(ETL_COMPILER_GCC) && (ETL_COMPILER_VERSION < 8)) TEST(test_flat_multimap_template_deduction) { using Pair = ETL_OR_STD::pair; diff --git a/test/test_flat_multiset.cpp b/test/test_flat_multiset.cpp index 0e5eca37..99177570 100644 --- a/test/test_flat_multiset.cpp +++ b/test/test_flat_multiset.cpp @@ -245,7 +245,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_flat_set.cpp b/test/test_flat_set.cpp index a67af8fb..19fef917 100644 --- a/test/test_flat_set.cpp +++ b/test/test_flat_set.cpp @@ -258,7 +258,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_forward_list.cpp b/test/test_forward_list.cpp index 3a9ee37a..28a16ffb 100644 --- a/test/test_forward_list.cpp +++ b/test/test_forward_list.cpp @@ -94,7 +94,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_indirect_vector.cpp b/test/test_indirect_vector.cpp index c2e16a5c..0c498527 100644 --- a/test/test_indirect_vector.cpp +++ b/test/test_indirect_vector.cpp @@ -136,7 +136,7 @@ namespace CHECK_EQUAL(data.max_size(), SIZE); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_list.cpp b/test/test_list.cpp index 20284cb2..9d62be46 100644 --- a/test/test_list.cpp +++ b/test/test_list.cpp @@ -105,7 +105,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_map.cpp b/test/test_map.cpp index e7dd0a91..88e4fd0c 100644 --- a/test/test_map.cpp +++ b/test/test_map.cpp @@ -193,7 +193,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_multimap.cpp b/test/test_multimap.cpp index e984b0d7..981416f1 100644 --- a/test/test_multimap.cpp +++ b/test/test_multimap.cpp @@ -195,7 +195,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_multiset.cpp b/test/test_multiset.cpp index cb6a9c9e..bc958e6c 100644 --- a/test/test_multiset.cpp +++ b/test/test_multiset.cpp @@ -210,7 +210,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_set.cpp b/test/test_set.cpp index 5eaea8b4..04962771 100644 --- a/test/test_set.cpp +++ b/test/test_set.cpp @@ -226,7 +226,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_span.cpp b/test/test_span.cpp index a94b077d..286b9fc8 100644 --- a/test/test_span.cpp +++ b/test/test_span.cpp @@ -260,7 +260,7 @@ namespace CHECK(isEqual); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_unordered_map.cpp b/test/test_unordered_map.cpp index 20eef715..9694ef89 100644 --- a/test/test_unordered_map.cpp +++ b/test/test_unordered_map.cpp @@ -244,7 +244,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_unordered_multimap.cpp b/test/test_unordered_multimap.cpp index 668af4d7..742cf50f 100644 --- a/test/test_unordered_multimap.cpp +++ b/test/test_unordered_multimap.cpp @@ -221,7 +221,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_unordered_multiset.cpp b/test/test_unordered_multiset.cpp index a9fc5328..eac87514 100644 --- a/test/test_unordered_multiset.cpp +++ b/test/test_unordered_multiset.cpp @@ -162,7 +162,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_unordered_set.cpp b/test/test_unordered_set.cpp index c7be4e42..cfe6eb13 100644 --- a/test/test_unordered_set.cpp +++ b/test/test_unordered_set.cpp @@ -155,7 +155,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_vector.cpp b/test/test_vector.cpp index 8dea8b90..1798f981 100644 --- a/test/test_vector.cpp +++ b/test/test_vector.cpp @@ -83,7 +83,7 @@ namespace CHECK(data.begin() == data.end()); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_vector_non_trivial.cpp b/test/test_vector_non_trivial.cpp index 4ad08846..d620876c 100644 --- a/test/test_vector_non_trivial.cpp +++ b/test/test_vector_non_trivial.cpp @@ -92,7 +92,7 @@ namespace CHECK_EQUAL(data.max_size(), SIZE); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) { diff --git a/test/test_vector_pointer.cpp b/test/test_vector_pointer.cpp index c866642b..bc335cf2 100644 --- a/test/test_vector_pointer.cpp +++ b/test/test_vector_pointer.cpp @@ -99,7 +99,7 @@ namespace CHECK_EQUAL(data.max_size(), SIZE); } -#if ETL_USING_STL && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) +#if ETL_CPP17_SUPPORTED && ETL_USING_INITIALIZER_LIST && !defined(ETL_TEMPLATE_DEDUCTION_GUIDE_TESTS_DISABLED) //************************************************************************* TEST(test_cpp17_deduced_constructor) {