Move 'quoted' for string_view from <string_view> to <iomanip> (where the other versio...

llvm-svn: 285300

diff --git a/libcxx/include/iomanip b/libcxx/include/iomanip
index bb21bd7..a6bee73 100644 (file)
--- a/libcxx/include/iomanip
+++ b/libcxx/include/iomanip
@@ -654,6 +654,15 @@ quoted ( basic_string <_CharT, _Traits, _Allocator> &__s, _CharT __delim = _Char
 {
     return __quoted(__s, __delim, __escape);
 }
+
+template <class _CharT, class _Traits>
+__quoted_output_proxy<_CharT, const _CharT *, _Traits>
+quoted (basic_string_view <_CharT, _Traits> __sv,
+             _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
+{
+    return __quoted_output_proxy<_CharT, const _CharT *, _Traits> 
+         ( __sv.data(), __sv.data() + __sv.size(), __delim, __escape );
+}
 #endif
 
 _LIBCPP_END_NAMESPACE_STD

diff --git a/libcxx/include/string_view b/libcxx/include/string_view
index 47ea926..baba464 100644 (file)
--- a/libcxx/include/string_view
+++ b/libcxx/include/string_view
@@ -747,18 +747,6 @@ hash<basic_string_view<_CharT, _Traits> >::operator()(
     return __do_string_hash(__val.data(), __val.data() + __val.size());
 }
 
-#if _LIBCPP_STD_VER > 11
-
-template <class _CharT, class _Traits>
-__quoted_output_proxy<_CharT, const _CharT *, _Traits>
-quoted (basic_string_view <_CharT, _Traits> __sv,
-             _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
-{
-    return __quoted_output_proxy<_CharT, const _CharT *, _Traits> 
-         ( __sv.data(), __sv.data() + __sv.size(), __delim, __escape );
-}
-#endif // _LIBCPP_STD_VER > 11
-
 _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STRING_VIEW