diff options
| -rw-r--r-- | libcxx/include/string_view | 16 | ||||
| -rw-r--r-- | libcxx/test/std/strings/string.view/string_view.literals/literal.pass.cpp | 6 |
2 files changed, 14 insertions, 8 deletions
diff --git a/libcxx/include/string_view b/libcxx/include/string_view index 4c759ab5dae..c5cc255eb57 100644 --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -155,10 +155,10 @@ namespace std { template <> struct hash<u32string_view>; template <> struct hash<wstring_view>; - constexpr basic_string<char> operator "" s( const char *str, size_t len ); // C++17 - constexpr basic_string<wchar_t> operator "" s( const wchar_t *str, size_t len ); // C++17 - constexpr basic_string<char16_t> operator "" s( const char16_t *str, size_t len ); // C++17 - constexpr basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++17 + constexpr basic_string_view<char> operator "" sv( const char *str, size_t len ) noexcept; + constexpr basic_string_view<wchar_t> operator "" sv( const wchar_t *str, size_t len ) noexcept; + constexpr basic_string_view<char16_t> operator "" sv( const char16_t *str, size_t len ) noexcept; + constexpr basic_string_view<char32_t> operator "" sv( const char32_t *str, size_t len ) noexcept; } // namespace std @@ -760,25 +760,25 @@ inline namespace literals inline namespace string_view_literals { inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR - basic_string_view<char> operator "" sv(const char *__str, size_t __len) + basic_string_view<char> operator "" sv(const char *__str, size_t __len) _NOEXCEPT { return basic_string_view<char> (__str, __len); } inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR - basic_string_view<wchar_t> operator "" sv(const wchar_t *__str, size_t __len) + basic_string_view<wchar_t> operator "" sv(const wchar_t *__str, size_t __len) _NOEXCEPT { return basic_string_view<wchar_t> (__str, __len); } inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR - basic_string_view<char16_t> operator "" sv(const char16_t *__str, size_t __len) + basic_string_view<char16_t> operator "" sv(const char16_t *__str, size_t __len) _NOEXCEPT { return basic_string_view<char16_t> (__str, __len); } inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR - basic_string_view<char32_t> operator "" sv(const char32_t *__str, size_t __len) + basic_string_view<char32_t> operator "" sv(const char32_t *__str, size_t __len) _NOEXCEPT { return basic_string_view<char32_t> (__str, __len); } diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal.pass.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal.pass.cpp index 710009cc51e..79fe355289d 100644 --- a/libcxx/test/std/strings/string.view/string_view.literals/literal.pass.cpp +++ b/libcxx/test/std/strings/string.view/string_view.literals/literal.pass.cpp @@ -54,4 +54,10 @@ int main() static_assert( L"ABC"sv.size() == 3, ""); static_assert( u"ABC"sv.size() == 3, ""); static_assert( U"ABC"sv.size() == 3, ""); + + static_assert(noexcept( "ABC"sv), ""); + static_assert(noexcept(u8"ABC"sv), ""); + static_assert(noexcept( L"ABC"sv), ""); + static_assert(noexcept( u"ABC"sv), ""); + static_assert(noexcept( U"ABC"sv), ""); } |
