LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark string_view literals as 'noexcept'. Fixes PR#25054. Thanks to Pavel K for the bug report.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@316439 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2017-10-24 14:06:00 +00:00
parent f45f32b025
commit 66db4e4fdd
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/string_view
View File

@@ -155,10 +155,10 @@ namespace std {
template <> struct hash<u32string_view>; template <> struct hash<u32string_view>;
template <> struct hash<wstring_view>; template <> struct hash<wstring_view>;
constexpr basic_string<char> operator "" s( const char *str, size_t len ); // C++17 constexpr basic_string_view<char> operator "" sv( const char *str, size_t len ) noexcept;
constexpr basic_string<wchar_t> operator "" s( const wchar_t *str, size_t len ); // C++17 constexpr basic_string_view<wchar_t> operator "" sv( const wchar_t *str, size_t len ) noexcept;
constexpr basic_string<char16_t> operator "" s( const char16_t *str, size_t len ); // C++17 constexpr basic_string_view<char16_t> operator "" sv( const char16_t *str, size_t len ) noexcept;
constexpr basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++17 constexpr basic_string_view<char32_t> operator "" sv( const char32_t *str, size_t len ) noexcept;
} // namespace std } // namespace std
@@ -760,25 +760,25 @@ inline namespace literals
inline namespace string_view_literals inline namespace string_view_literals
{ {
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR 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); return basic_string_view<char> (__str, __len);
} }
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR 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); return basic_string_view<wchar_t> (__str, __len);
} }
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR 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); return basic_string_view<char16_t> (__str, __len);
} }
inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR 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); return basic_string_view<char32_t> (__str, __len);
} }

6
test/std/strings/string.view/string_view.literals/literal.pass.cpp
View File

@@ -54,4 +54,10 @@ int main()
static_assert( L"ABC"sv.size() == 3, ""); static_assert( L"ABC"sv.size() == 3, "");
static_assert( u"ABC"sv.size() == 3, ""); static_assert( u"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), "");
} }