Skip to content

Commit

Permalink
PR libstdc++/82685 add 'noexcept' to string_view literals
Browse files Browse the repository at this point in the history
	PR libstdc++/82685
	* include/experimental/string_view (operator""sv): Add noexcept.
	* include/std/string_view (operator""sv): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@254041 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
redi committed Oct 24, 2017
1 parent bf9129e commit 01a6e9e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions libstdc++-v3/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
2017-10-24 Jonathan Wakely <jwakely@redhat.com>

PR libstdc++/82685
* include/experimental/string_view (operator""sv): Add noexcept.
* include/std/string_view (operator""sv): Likewise.

2017-10-23 Jonathan Wakely <jwakely@redhat.com>

* include/Makefile.am: Add new headers for C++17 filesystem library.
Expand Down
8 changes: 4 additions & 4 deletions libstdc++-v3/include/experimental/string_view
Original file line number Diff line number Diff line change
Expand Up @@ -645,22 +645,22 @@ namespace experimental
inline namespace string_view_literals
{
inline constexpr basic_string_view<char>
operator""sv(const char* __str, size_t __len)
operator""sv(const char* __str, size_t __len) noexcept
{ return basic_string_view<char>{__str, __len}; }

#ifdef _GLIBCXX_USE_WCHAR_T
inline constexpr basic_string_view<wchar_t>
operator""sv(const wchar_t* __str, size_t __len)
operator""sv(const wchar_t* __str, size_t __len) noexcept
{ return basic_string_view<wchar_t>{__str, __len}; }
#endif

#ifdef _GLIBCXX_USE_C99_STDINT_TR1
inline constexpr basic_string_view<char16_t>
operator""sv(const char16_t* __str, size_t __len)
operator""sv(const char16_t* __str, size_t __len) noexcept
{ return basic_string_view<char16_t>{__str, __len}; }

inline constexpr basic_string_view<char32_t>
operator""sv(const char32_t* __str, size_t __len)
operator""sv(const char32_t* __str, size_t __len) noexcept
{ return basic_string_view<char32_t>{__str, __len}; }
#endif
} // namespace string_literals
Expand Down
8 changes: 4 additions & 4 deletions libstdc++-v3/include/std/string_view
Original file line number Diff line number Diff line change
Expand Up @@ -636,22 +636,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
inline namespace string_view_literals
{
inline constexpr basic_string_view<char>
operator""sv(const char* __str, size_t __len)
operator""sv(const char* __str, size_t __len) noexcept
{ return basic_string_view<char>{__str, __len}; }

#ifdef _GLIBCXX_USE_WCHAR_T
inline constexpr basic_string_view<wchar_t>
operator""sv(const wchar_t* __str, size_t __len)
operator""sv(const wchar_t* __str, size_t __len) noexcept
{ return basic_string_view<wchar_t>{__str, __len}; }
#endif

#ifdef _GLIBCXX_USE_C99_STDINT_TR1
inline constexpr basic_string_view<char16_t>
operator""sv(const char16_t* __str, size_t __len)
operator""sv(const char16_t* __str, size_t __len) noexcept
{ return basic_string_view<char16_t>{__str, __len}; }

inline constexpr basic_string_view<char32_t>
operator""sv(const char32_t* __str, size_t __len)
operator""sv(const char32_t* __str, size_t __len) noexcept
{ return basic_string_view<char32_t>{__str, __len}; }
#endif
} // namespace string_literals
Expand Down

0 comments on commit 01a6e9e

Please sign in to comment.