From 9ed9b90f1df265d45e9d276024082e96349b0828 Mon Sep 17 00:00:00 2001
From: John Wellbelove <github@wellbelove.co.uk>
Date: Sat, 30 Nov 2024 11:19:43 +0000
Subject: [PATCH] Fixed merge issues

---
 include/etl/string_view.h | 12 ------
 test/test_string_view.cpp | 80 ---------------------------------------
 2 files changed, 92 deletions(-)

diff --git a/include/etl/string_view.h b/include/etl/string_view.h
index 7b60d839..c3c7e80e 100644
--- a/include/etl/string_view.h
+++ b/include/etl/string_view.h
@@ -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.
     //*************************************************************************
diff --git a/test/test_string_view.cpp b/test/test_string_view.cpp
index bc9404e6..afa1e6d3 100644
--- a/test/test_string_view.cpp
+++ b/test/test_string_view.cpp
@@ -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)
     {