[libcxx-commits] [libcxx] eae745c - [libc++] [test] Qualify calls to iomanip functions in std/input.output/iostream.format/. NFCI.

Arthur O'Dwyer via libcxx-commits libcxx-commits at lists.llvm.org
Wed Feb 16 08:04:14 PST 2022


Author: Arthur O'Dwyer
Date: 2022-02-16T11:03:33-05:00
New Revision: eae745c18e2e432b238b8e8b69726b2ea9aeaf7b

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

LOG: [libc++] [test] Qualify calls to iomanip functions in std/input.output/iostream.format/. NFCI.

Reviewed as part of D119860.

Added: 
    

Modified: 
    libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
    libcxx/test/std/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
    libcxx/test/std/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp b/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
index 1678412014ba9..199e792e80a11 100644
--- a/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
@@ -59,7 +59,7 @@ int main(int, char**)
         testbuf<char> sb;
         std::ostream os(&sb);
         os.imbue(std::locale(LOCALE_en_US_UTF_8));
-        showbase(os);
+        std::showbase(os);
         long double x = -123456789;
         os << std::put_money(x, false);
         assert(sb.str() == "-$1,234,567.89");
@@ -68,7 +68,7 @@ int main(int, char**)
         testbuf<char> sb;
         std::ostream os(&sb);
         os.imbue(std::locale(LOCALE_en_US_UTF_8));
-        showbase(os);
+        std::showbase(os);
         long double x = -123456789;
         os << std::put_money(x, true);
         assert(sb.str() == "-USD 1,234,567.89");
@@ -78,7 +78,7 @@ int main(int, char**)
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
         os.imbue(std::locale(LOCALE_en_US_UTF_8));
-        showbase(os);
+        std::showbase(os);
         long double x = -123456789;
         os << std::put_money(x, false);
         assert(sb.str() == L"-$1,234,567.89");
@@ -87,7 +87,7 @@ int main(int, char**)
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
         os.imbue(std::locale(LOCALE_en_US_UTF_8));
-        showbase(os);
+        std::showbase(os);
         long double x = -123456789;
         os << std::put_money(x, true);
         assert(sb.str() == L"-USD 1,234,567.89");

diff  --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
index 96c3b74ce2ea7..2cd2fcb8b818a 100644
--- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.manip/ws.pass.cpp
@@ -45,7 +45,7 @@ int main(int, char**)
     {
         testbuf<char> sb("   123");
         std::istream is(&sb);
-        ws(is);
+        std::ws(is);
         assert(is.good());
         assert(is.peek() == '1');
     }
@@ -53,7 +53,7 @@ int main(int, char**)
     {
         testbuf<wchar_t> sb(L"   123");
         std::wistream is(&sb);
-        ws(is);
+        std::ws(is);
         assert(is.good());
         assert(is.peek() == L'1');
     }
@@ -61,10 +61,10 @@ int main(int, char**)
     {
         testbuf<char> sb("  ");
         std::istream is(&sb);
-        ws(is);
+        std::ws(is);
         assert(!is.fail());
         assert(is.eof());
-        ws(is);
+        std::ws(is);
         assert(is.eof());
         assert(is.fail());
     }
@@ -72,10 +72,10 @@ int main(int, char**)
     {
         testbuf<wchar_t> sb(L"  ");
         std::wistream is(&sb);
-        ws(is);
+        std::ws(is);
         assert(!is.fail());
         assert(is.eof());
-        ws(is);
+        std::ws(is);
         assert(is.eof());
         assert(is.fail());
     }

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp
index 2ee607b372896..6b81287d2e013 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/bool.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        boolalpha(os);
+        std::boolalpha(os);
         bool b = true;
         os << b;
         assert(sb.str() == "true");
@@ -84,7 +84,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        boolalpha(os);
+        std::boolalpha(os);
         bool b = false;
         os << b;
         assert(sb.str() == "false");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp
index d68be897a524f..0cda918ed5ad5 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/double.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         double n = -10.5;
         os << n;
         assert(sb.str() == "-10.5");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp
index e2d5ee6bed198..a28e7575ab4f6 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/float.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         float n = -10.5;
         os << n;
         assert(sb.str() == "-10.5");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp
index 3ca0741e71a3f..732b611adf7b9 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/int.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         int n = -10;
         os << n;
         assert(sb.str() == "fffffff6");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp
index b100c02081ed8..2eb5e55ce6f56 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         long n = 0xfffffff6;
         os << n;
         assert(sb.str() == "fffffff6");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp
index 8b9586556aef0..8fafd7c009c7b 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_double.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         long double n = -10.5;
         os << n;
         assert(sb.str() == "-10.5");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp
index e1033dc2718a4..a724a6e47d135 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/long_long.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         long long n = -10;
         os << n;
         assert(sb.str() == "fffffffffffffff6");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp
index 808d9838ecacd..475d518de966a 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/short.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         short n = -10;
         os << n;
         assert(sb.str() == "fff6");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp
index 40664e70c314e..54ba23e91de45 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_int.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         unsigned int n = 0xFFF6;
         os << n;
         assert(sb.str() == "fff6");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp
index bf4b92627fe18..e84f21472e097 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         unsigned long n = 0xfffffff6;
         os << n;
         assert(sb.str() == "fffffff6");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
index edc55e2e27f69..34b5302740cd2 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         unsigned long long n = static_cast<unsigned long long>(-10);
         os << n;
         assert(sb.str() == "fffffffffffffff6");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp
index 001070a831c05..d24f7ba13e229 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_short.pass.cpp
@@ -76,7 +76,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        hex(os);
+        std::hex(os);
         unsigned short n = 0xFFF6;
         os << n;
         assert(sb.str() == "fff6");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
index 6adf30f3bdaec..f0867ef1043f2 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
@@ -82,7 +82,7 @@ int main(int, char**)
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         wchar_t c = L'a';
         os << c;
         assert(sb.str() == L"a    ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
index 1ce962c9bc111..8046dfd3da608 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
@@ -82,7 +82,7 @@ int main(int, char**)
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         const wchar_t* c = L"123";
         os << c;
         assert(sb.str() == L"123  ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
index 9fd9eb0a026b0..d9dd4f3235065 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char.pass.cpp
@@ -80,7 +80,7 @@ int main(int, char**)
         testbuf<char> sb;
         std::ostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         char c = 'a';
         os << c;
         assert(sb.str() == "a    ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
index baea963f56086..f8c9aca42a2eb 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_pointer.pass.cpp
@@ -80,7 +80,7 @@ int main(int, char**)
         testbuf<char> sb;
         std::ostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         const char* c = "123";
         os << c;
         assert(sb.str() == "123  ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
index c1e18eab13585..797e4297c9f01 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
@@ -82,7 +82,7 @@ int main(int, char**)
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         char c = 'a';
         os << c;
         assert(sb.str() == L"a    ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
index 98c01532af827..1015da8b0fac3 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
@@ -82,7 +82,7 @@ int main(int, char**)
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         const char* c = "123";
         os << c;
         assert(sb.str() == L"123  ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
index 7616f23db6f26..6ee9d5c4375cd 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char.pass.cpp
@@ -80,7 +80,7 @@ int main(int, char**)
         testbuf<char> sb;
         std::ostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         signed char c = 'a';
         os << c;
         assert(sb.str() == "a    ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
index 1812d06138258..a42afd69cc3ad 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/signed_char_pointer.pass.cpp
@@ -80,7 +80,7 @@ int main(int, char**)
         testbuf<char> sb;
         std::ostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         const signed char* c = (const signed char*)"123";
         os << c;
         assert(sb.str() == "123  ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
index 1264942e7f6a3..ed6a3653747f0 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char.pass.cpp
@@ -80,7 +80,7 @@ int main(int, char**)
         testbuf<char> sb;
         std::ostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         unsigned char c = 'a';
         os << c;
         assert(sb.str() == "a    ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
index ba6d1ea2fb120..4393d5e521996 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/unsigned_char_pointer.pass.cpp
@@ -80,7 +80,7 @@ int main(int, char**)
         testbuf<char> sb;
         std::ostream os(&sb);
         os.width(5);
-        left(os);
+        std::left(os);
         const unsigned char* c = (const unsigned char*)"123";
         os << c;
         assert(sb.str() == "123  ");

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
index bedbe6c4ec94c..d97dcefa640e7 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/endl.pass.cpp
@@ -65,7 +65,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        endl(os);
+        std::endl(os);
         assert(sb.str() == "\n");
         assert(sync_called == 1);
         assert(os.good());
@@ -74,7 +74,7 @@ int main(int, char**)
     {
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
-        endl(os);
+        std::endl(os);
         assert(sb.str() == L"\n");
         assert(sync_called == 2);
         assert(os.good());

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
index e4c0cd694cc44..b005c8e7126c9 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/ends.pass.cpp
@@ -56,7 +56,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        ends(os);
+        std::ends(os);
         assert(sb.str().size() == 1);
         assert(sb.str().back() == 0);
         assert(os.good());
@@ -65,7 +65,7 @@ int main(int, char**)
     {
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
-        ends(os);
+        std::ends(os);
         assert(sb.str().size() == 1);
         assert(sb.str().back() == 0);
         assert(os.good());

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
index 20d541ef36083..f6b28af784e3b 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.manip/flush.pass.cpp
@@ -45,7 +45,7 @@ int main(int, char**)
     {
         testbuf<char> sb;
         std::ostream os(&sb);
-        flush(os);
+        std::flush(os);
         assert(sync_called == 1);
         assert(os.good());
     }
@@ -53,7 +53,7 @@ int main(int, char**)
     {
         testbuf<wchar_t> sb;
         std::wostream os(&sb);
-        flush(os);
+        std::flush(os);
         assert(sync_called == 2);
         assert(os.good());
     }

diff  --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp
index 66ed0acba266f..ad527ac6578b1 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream_sentry/destruct.pass.cpp
@@ -55,7 +55,7 @@ int main(int, char**)
         std::ostream os(&sb);
         std::ostream::sentry s(os);
         assert(bool(s));
-        unitbuf(os);
+        std::unitbuf(os);
     }
     assert(sync_called == 1);
 #ifndef TEST_HAS_NO_EXCEPTIONS
@@ -66,7 +66,7 @@ int main(int, char**)
         {
             std::ostream::sentry s(os);
             assert(bool(s));
-            unitbuf(os);
+            std::unitbuf(os);
             throw 1;
         }
         catch (...)


        


More information about the libcxx-commits mailing list