coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-04-30 19:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Ubuntu 18

Browse Source
This commit is contained in:
John Wellbelove 2021-11-21 16:45:37 +00:00
parent ed0d2f5759
commit 3e98f4c537
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/deque.h
View File

@ -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
//*************************************************************************

24
test/test_deque.cpp
View File

@ -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