[libcxx-commits] [libcxx] 564c7fa - [libc++] ADL-proof calls to __quoted and noskipws.

[Arthur O'Dwyer via libcxx-commits]

Author: Arthur O'Dwyer
Date: 2022-03-04T23:06:28-05:00
New Revision: 564c7fa1b7999bf7a6f8c50579535c71cca73e02

URL: https://github.com/llvm/llvm-project/commit/564c7fa1b7999bf7a6f8c50579535c71cca73e02
DIFF: https://github.com/llvm/llvm-project/commit/564c7fa1b7999bf7a6f8c50579535c71cca73e02.diff

LOG: [libc++] ADL-proof calls to __quoted and noskipws.

Reviewed as part of D120135.

Added: 
    

Modified: 
    libcxx/include/__filesystem/path.h
    libcxx/include/iomanip

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__filesystem/path.h b/libcxx/include/__filesystem/path.h
index 6b4b1ae9baa20..29bb1e94a8f3f 100644
--- a/libcxx/include/__filesystem/path.h
+++ b/libcxx/include/__filesystem/path.h
@@ -968,7 +968,7 @@ class _LIBCPP_TYPE_VIS path {
   _LIBCPP_INLINE_VISIBILITY friend basic_istream<_CharT, _Traits>&
   operator>>(basic_istream<_CharT, _Traits>& __is, path& __p) {
     basic_string<_CharT, _Traits> __tmp;
-    __is >> __quoted(__tmp);
+    __is >> _VSTD::__quoted(__tmp);
     __p = __tmp;
     return __is;
   }

diff  --git a/libcxx/include/iomanip b/libcxx/include/iomanip
index 05826cd4e31b7..e3b4e8d7f3c31 100644
--- a/libcxx/include/iomanip
+++ b/libcxx/include/iomanip
@@ -548,7 +548,7 @@ __quoted_input ( basic_istream<_CharT, _Traits> &__is, _String & __string, _Char
     }
 
     __save_flags<_CharT, _Traits> sf(__is);
-    noskipws (__is);
+    std::noskipws(__is);
     while (true)
         {
         __is >> __c;
@@ -573,7 +573,7 @@ basic_ostream<_CharT, _Traits>& operator<<(
          basic_ostream<_CharT, _Traits>& __os,
          const __quoted_output_proxy<_CharT, _Iter, _Traits> & __proxy)
 {
-    return __quoted_output(__os, __proxy.__first, __proxy.__last, __proxy.__delim, __proxy.__escape);
+    return std::__quoted_output(__os, __proxy.__first, __proxy.__last, __proxy.__delim, __proxy.__escape);
 }
 
 template <class _CharT, class _Traits, class _Allocator>
@@ -593,7 +593,7 @@ basic_ostream<_CharT, _Traits>& operator<<(
         basic_ostream<_CharT, _Traits>& __os,
         const __quoted_proxy<_CharT, _Traits, _Allocator> & __proxy)
 {
-    return __quoted_output (__os, __proxy.__string.cbegin (), __proxy.__string.cend (), __proxy.__delim, __proxy.__escape);
+    return std::__quoted_output (__os, __proxy.__string.cbegin (), __proxy.__string.cend (), __proxy.__delim, __proxy.__escape);
 }
 
 //  extractor for non-const basic_string& proxies
@@ -603,7 +603,7 @@ basic_istream<_CharT, _Traits>& operator>>(
         basic_istream<_CharT, _Traits>& __is,
         const __quoted_proxy<_CharT, _Traits, _Allocator> & __proxy)
 {
-    return __quoted_input ( __is, __proxy.__string, __proxy.__delim, __proxy.__escape );
+    return std::__quoted_input ( __is, __proxy.__string, __proxy.__delim, __proxy.__escape );
 }
 
 
@@ -644,7 +644,7 @@ _LIBCPP_INLINE_VISIBILITY
 __quoted_output_proxy<_CharT, typename basic_string <_CharT, _Traits, _Allocator>::const_iterator>
 quoted ( const basic_string <_CharT, _Traits, _Allocator> &__s, _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
 {
-    return __quoted(__s, __delim, __escape);
+    return std::__quoted(__s, __delim, __escape);
 }
 
 template <class _CharT, class _Traits, class _Allocator>
@@ -652,7 +652,7 @@ _LIBCPP_INLINE_VISIBILITY
 __quoted_proxy<_CharT, _Traits, _Allocator>
 quoted ( basic_string <_CharT, _Traits, _Allocator> &__s, _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
 {
-    return __quoted(__s, __delim, __escape);
+    return std::__quoted(__s, __delim, __escape);
 }
 
 template <class _CharT, class _Traits>