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

#675 Compilation error in optional.h line 405

Browse Source 
Changes for compatibility with C++20

Restore C++17 unit test compatibility
This commit is contained in:
John Wellbelove 2023-03-10 17:45:39 +00:00
parent 542a28a6f3
commit 574e041485
5 changed files with 127 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -370,3 +370,7 @@ test/vs2022/random_pcg.csv
test/vs2022/random_xorshift.csv
test/vs2019/MSVC - No STL -O2
test/vs2022/Debug - No STL
test/vs2022/Debug MSVC C++20
test/vs2022/Debug MSVC - Force C++03
test/vs2022/Debug MSVC - No STL - Built-ins
test/vs2022/Debug MSVC - No STL - Force Built-ins

21
include/etl/char_traits.h
View File

@ -65,6 +65,17 @@ namespace etl
typedef char state_type;
};
#if ETL_USING_CPP20
template<> struct char_traits_types<char8_t>
{
typedef char8_t char_type;
typedef unsigned int int_type;
typedef long long off_type;
typedef size_t pos_type;
typedef char state_type;
};
#endif
template<> struct char_traits_types<char16_t>
{
typedef char16_t char_type;
@ -186,17 +197,17 @@ namespace etl
{
for (size_t i = 0UL; i < count; ++i)
{
if (*s1 < *s2)
const char_type c1 = *s1++;
const char_type c2 = *s2++;
if (c1 < c2)
{
return -1;
}
else if (*s1 > *s2)
else if (c1 > c2)
{
return 1;
}
++s1;
++s2;
}
return 0;

109
test/UnitTest++/Checks.h
View File

@ -31,8 +31,14 @@ namespace UnitTest {
return !value;
}
#if __cplusplus >= 202002L
template< typename Expected, typename Actual >
void CheckEqual(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
std::enable_if_t<!(std::is_same_v<wchar_t, std::remove_cvref_t<std::remove_pointer_t<Expected>>> || std::is_same_v<wchar_t, std::remove_cvref_t<std::remove_pointer_t<Actual>>> ||
std::is_same_v<char8_t, std::remove_cvref_t<std::remove_pointer_t<Expected>>> || std::is_same_v<char8_t, std::remove_cvref_t<std::remove_pointer_t<Actual>>> ||
std::is_same_v<char16_t, std::remove_cvref_t<std::remove_pointer_t<Expected>>> || std::is_same_v<char16_t, std::remove_cvref_t<std::remove_pointer_t<Actual>>> ||
std::is_same_v<char32_t, std::remove_cvref_t<std::remove_pointer_t<Expected>>> || std::is_same_v<char32_t, std::remove_cvref_t<std::remove_pointer_t<Actual>>>), void>
CheckEqual(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
{
if (!(expected == actual))
{
@ -43,6 +49,38 @@ namespace UnitTest {
}
}
template< typename Expected, typename Actual >
std::enable_if_t<(std::is_same_v<wchar_t, std::remove_cvref_t<std::remove_pointer_t<Expected>>> || std::is_same_v<wchar_t, std::remove_cvref_t<std::remove_pointer_t<Actual>>> ||
std::is_same_v<char8_t, std::remove_cvref_t<std::remove_pointer_t<Expected>>> || std::is_same_v<char8_t, std::remove_cvref_t<std::remove_pointer_t<Actual>>> ||
std::is_same_v<char16_t, std::remove_cvref_t<std::remove_pointer_t<Expected>>> || std::is_same_v<char16_t, std::remove_cvref_t<std::remove_pointer_t<Actual>>> ||
std::is_same_v<char32_t, std::remove_cvref_t<std::remove_pointer_t<Expected>>> || std::is_same_v<char32_t, std::remove_cvref_t<std::remove_pointer_t<Actual>>>), void>
CheckEqual(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
{
if (!(expected == actual))
{
using int_type_expected = std::char_traits<Expected>::int_type;
using int_type_actual = std::char_traits<Actual>::int_type;
UnitTest::MemoryOutStream stream;
stream << "Expected " << int_type_expected(expected) << " but was " << int_type_actual(actual);
results.OnTestFailure(details, stream.GetText());
}
}
#else
template< typename Expected, typename Actual >
void CheckEqual(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
{
if (!(expected == actual))
{
UnitTest::MemoryOutStream stream;
stream << "Expected " << expected << " but was " << actual;
results.OnTestFailure(details, stream.GetText());
}
}
#endif
template< typename Expected, typename Actual >
void CheckEqualHex(TestResults& results, Expected const& expected, Actual const& actual, TestDetails const& details)
{
@ -106,11 +144,11 @@ namespace UnitTest {
}
}
#if __cplusplus >= 202002L
template< typename Expected, typename Actual >
void CheckArrayEqual(TestResults& results, Expected const& expected, Actual const& actual,
size_t const count, TestDetails const& details)
{
{
bool equal = true;
for (size_t i = 0; i < count; ++i)
equal &= (expected[i] == actual[i]);
@ -121,19 +159,72 @@ namespace UnitTest {
stream << "Expected [ ";
for (size_t expectedIndex = 0; expectedIndex < count; ++expectedIndex)
stream << expected[expectedIndex] << " ";
using expected_type = std::remove_cvref_t<decltype(expected[0])>;
using actual_type = std::remove_cvref_t<decltype(actual[0])>;
stream << "] but was [ ";
if constexpr (std::is_same_v<wchar_t, expected_type> || std::is_same_v<wchar_t, actual_type> ||
std::is_same_v<char8_t, expected_type> || std::is_same_v<char8_t, actual_type> ||
std::is_same_v<char16_t, expected_type> || std::is_same_v<char16_t, actual_type> ||
std::is_same_v<char32_t, expected_type> || std::is_same_v<char32_t, actual_type>)
{
using int_type_expected = std::char_traits<expected_type>::int_type;
using int_type_actual = std::char_traits<actual_type>::int_type;
for (size_t actualIndex = 0; actualIndex < count; ++actualIndex)
stream << actual[actualIndex] << " ";
for (size_t expectedIndex = 0; expectedIndex < count; ++expectedIndex)
stream << int_type_expected(expected[expectedIndex]) << " ";
stream << "]";
stream << "] but was [ ";
for (size_t actualIndex = 0; actualIndex < count; ++actualIndex)
stream << int_type_actual(actual[actualIndex]) << " ";
stream << "]";
}
else
{
for (size_t expectedIndex = 0; expectedIndex < count; ++expectedIndex)
stream << expected[expectedIndex] << " ";
stream << "] but was [ ";
for (size_t actualIndex = 0; actualIndex < count; ++actualIndex)
stream << actual[actualIndex] << " ";
stream << "]";
}
results.OnTestFailure(details, stream.GetText());
}
}
#else
template< typename Expected, typename Actual >
void CheckArrayEqual(TestResults& results, Expected const& expected, Actual const& actual,
size_t const count, TestDetails const& details)
{
bool equal = true;
for (size_t i = 0; i < count; ++i)
equal &= (expected[i] == actual[i]);
if (!equal)
{
UnitTest::MemoryOutStream stream;
stream << "Expected [ ";
for (size_t expectedIndex = 0; expectedIndex < count; ++expectedIndex)
stream << expected[expectedIndex] << " ";
stream << "] but was [ ";
for (size_t actualIndex = 0; actualIndex < count; ++actualIndex)
stream << actual[actualIndex] << " ";
stream << "]";
results.OnTestFailure(details, stream.GetText());
}
}
#endif
template< typename Expected, typename Actual, typename Tolerance >
bool ArrayAreClose(Expected const& expected, Actual const& actual, size_t const count, Tolerance const& tolerance)

2
test/test_char_traits.cpp
View File

@ -136,7 +136,7 @@ namespace
char_type* p_dst;
char_traits::assign(r, c);
CHECK_EQUAL(r, 'B');
CHECK_EQUAL(r, L'B');
CHECK(char_traits::eq(1, 1));
CHECK(!char_traits::eq(1, 2));

6
test/test_etl_traits.cpp
View File

@ -81,7 +81,13 @@ namespace
CHECK_EQUAL(ETL_VERSION_MINOR, etl::traits::version_minor);
CHECK_EQUAL(ETL_VERSION_PATCH, etl::traits::version_patch);
CHECK_EQUAL(ETL_VERSION_VALUE, etl::traits::version);
#if ETL_USING_CPP20
CHECK_EQUAL(20, etl::traits::language_standard);
#elif ETL_USING_CPP17
CHECK_EQUAL(17, etl::traits::language_standard);
#elif ETL_USING_CPP14
CHECK_EQUAL(14, etl::traits::language_standard);
#endif
CHECK_ARRAY_EQUAL(ETL_VERSION, etl::traits::version_string, etl::strlen(ETL_VERSION));
CHECK_ARRAY_EQUAL(ETL_VERSION, etl::traits::version_wstring, etl::strlen(ETL_VERSION_W));