Merge remote-tracking branch 'trunk' of git://gcc.gnu.org/git/gcc into gimplefegimplefe

1 files changed, 30 insertions, 0 deletions

diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view
index b2d2a296ba4..cf728dd83e9 100644
--- a/libstdc++-v3/include/std/string_view
+++ b/libstdc++-v3/include/std/string_view
@@ -640,6 +640,36 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     { };
 #endif
 
+  inline namespace literals
+  {
+  inline namespace string_view_literals
+  {
+  _GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+    inline constexpr basic_string_view<char>
+    operator""sv(const char* __str, size_t __len)
+    { 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)
+    { 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)
+    { return basic_string_view<char16_t>{__str, __len}; }
+
+    inline constexpr basic_string_view<char32_t>
+    operator""sv(const char32_t* __str, size_t __len)
+    { return basic_string_view<char32_t>{__str, __len}; }
+#endif
+
+  _GLIBCXX_END_NAMESPACE_VERSION
+  } // namespace string_literals
+  } // namespace literals
+
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std