diff --git a/include/string_view b/include/string_view index c5cc255eb..3e112eba6 100644 --- a/include/string_view +++ b/include/string_view @@ -216,7 +216,7 @@ public: basic_string_view& operator=(const basic_string_view&) _NOEXCEPT = default; _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY - basic_string_view(const _CharT* __s, size_type __len) + basic_string_view(const _CharT* __s, size_type __len) _NOEXCEPT : __data(__s), __size(__len) { // #if _LIBCPP_STD_VER > 11 diff --git a/test/std/strings/string.view/string.view.cons/default.pass.cpp b/test/std/strings/string.view/string.view.cons/default.pass.cpp index ca332801e..79fadf619 100644 --- a/test/std/strings/string.view/string.view.cons/default.pass.cpp +++ b/test/std/strings/string.view/string.view.cons/default.pass.cpp @@ -21,6 +21,8 @@ template void test () { #if TEST_STD_VER > 11 { + ASSERT_NOEXCEPT(T()); + constexpr T sv1; static_assert ( sv1.size() == 0, "" ); static_assert ( sv1.empty(), ""); diff --git a/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp b/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp index 6c9939340..c98a8bd67 100644 --- a/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp +++ b/test/std/strings/string.view/string.view.cons/from_literal.pass.cpp @@ -30,7 +30,11 @@ size_t StrLen ( const CharT *s ) { template void test ( const CharT *s ) { - std::basic_string_view sv1 ( s ); + typedef std::basic_string_view SV; +// I'd love to do this, but it would require traits::length() to be noexcept +// LIBCPP_ASSERT_NOEXCEPT(SV(s)); + + SV sv1 ( s ); assert ( sv1.size() == StrLen( s )); assert ( sv1.data() == s ); } diff --git a/test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp b/test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp index da4d264ae..2e4faab95 100644 --- a/test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp +++ b/test/std/strings/string.view/string.view.cons/from_ptr_len.pass.cpp @@ -23,7 +23,10 @@ template void test ( const CharT *s, size_t sz ) { { - std::basic_string_view sv1 ( s, sz ); + typedef std::basic_string_view SV; + LIBCPP_ASSERT_NOEXCEPT(SV(s, sz)); + + SV sv1 ( s, sz ); assert ( sv1.size() == sz ); assert ( sv1.data() == s ); } diff --git a/test/std/strings/string.view/string.view.cons/from_string.pass.cpp b/test/std/strings/string.view/string.view.cons/from_string.pass.cpp index 3ca6ea16f..5fad2bfaa 100644 --- a/test/std/strings/string.view/string.view.cons/from_string.pass.cpp +++ b/test/std/strings/string.view/string.view.cons/from_string.pass.cpp @@ -24,7 +24,10 @@ struct dummy_char_traits : public std::char_traits {}; template void test ( const std::basic_string &str ) { - std::basic_string_view sv1 ( str ); + typedef std::basic_string_view SV; + ASSERT_NOEXCEPT(SV(str)); + + SV sv1 ( str ); assert ( sv1.size() == str.size()); assert ( sv1.data() == str.data()); }