mirror of
https://github.com/ETLCPP/etl.git
synced 2026-11-09 22:59:47 +08:00
Fixed merge issues
This commit is contained in:
parent
9fdc03ae02
commit
9ed9b90f1d
@ -167,18 +167,6 @@ namespace etl
|
||||
{
|
||||
}
|
||||
|
||||
#if ETL_USING_STL && ETL_USING_CPP17
|
||||
//*************************************************************************
|
||||
/// Constructor from std::basic string_view
|
||||
//*************************************************************************
|
||||
template <typename TStdTraits>
|
||||
explicit ETL_CONSTEXPR basic_string_view(const std::basic_string_view<T, TStdTraits>& other) ETL_NOEXCEPT
|
||||
: mbegin(other.data())
|
||||
, mend(other.data() + other.size())
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
//*************************************************************************
|
||||
/// Returns a const reference to the first element.
|
||||
//*************************************************************************
|
||||
|
||||
@ -169,86 +169,6 @@ namespace
|
||||
CHECK(isEqual);
|
||||
}
|
||||
|
||||
#if ETL_USING_STL && ETL_USING_CPP17
|
||||
//*************************************************************************
|
||||
TEST(test_constructor_from_std_string_view)
|
||||
{
|
||||
std::string_view stdview(text.data(), text.size());
|
||||
|
||||
View view(stdview);
|
||||
|
||||
CHECK(stdview.size() == view.size());
|
||||
CHECK(stdview.size() == view.max_size());
|
||||
|
||||
bool isEqual = std::equal(view.begin(), view.end(), stdview.begin());
|
||||
CHECK(isEqual);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ETL_USING_STL && ETL_USING_CPP17
|
||||
//*************************************************************************
|
||||
TEST(test_constructor_from_std_wstring_view)
|
||||
{
|
||||
std::wstring_view stdview(wtext.data(), wtext.size());
|
||||
|
||||
WView view(stdview);
|
||||
|
||||
CHECK(stdview.size() == view.size());
|
||||
CHECK(stdview.size() == view.max_size());
|
||||
|
||||
bool isEqual = std::equal(view.begin(), view.end(), stdview.begin());
|
||||
CHECK(isEqual);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ETL_USING_STL && ETL_USING_CPP20
|
||||
//*************************************************************************
|
||||
TEST(test_constructor_from_std_u8string_view)
|
||||
{
|
||||
std::u8string_view stdview(u8text.begin(), u8text.end());
|
||||
|
||||
U8View view(stdview);
|
||||
|
||||
CHECK(stdview.size() == view.size());
|
||||
CHECK(stdview.size() == view.max_size());
|
||||
|
||||
bool isEqual = std::equal(view.begin(), view.end(), stdview.begin());
|
||||
CHECK(isEqual);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ETL_USING_STL && ETL_USING_CPP17
|
||||
//*************************************************************************
|
||||
TEST(test_constructor_from_std_u16string_view)
|
||||
{
|
||||
std::u16string_view stdview(u16text.data(), u16text.size());
|
||||
|
||||
U16View view(stdview);
|
||||
|
||||
CHECK(stdview.size() == view.size());
|
||||
CHECK(stdview.size() == view.max_size());
|
||||
|
||||
bool isEqual = std::equal(view.begin(), view.end(), stdview.begin());
|
||||
CHECK(isEqual);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ETL_USING_STL && ETL_USING_CPP17
|
||||
//*************************************************************************
|
||||
TEST(test_constructor_from_std_u32string_view)
|
||||
{
|
||||
std::u32string_view stdview(u32text.data(), u32text.size());
|
||||
|
||||
U32View view(stdview);
|
||||
|
||||
CHECK(stdview.size() == view.size());
|
||||
CHECK(stdview.size() == view.max_size());
|
||||
|
||||
bool isEqual = std::equal(view.begin(), view.end(), stdview.begin());
|
||||
CHECK(isEqual);
|
||||
}
|
||||
#endif
|
||||
|
||||
//*************************************************************************
|
||||
TEST(test_constructor_pointer_size)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user