From: Eric Fiselier <eric@efcs.ca>
Date: Tue, 23 Apr 2019 18:23:33 +0000 (+0000)
Subject: Fix namespace name conflict with GCC
X-Git-Tag: llvmorg-10-init~7200
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=433eecadeef854782e8f789940bb35682ef7857e;p=platform%2Fupstream%2Fllvm.git

Fix namespace name conflict with GCC

llvm-svn: 359023
---

diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp
index 4e3994f..e6f7d31 100644
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp
@@ -22,7 +22,7 @@
 
 #include "test_macros.h"
 
-namespace exp = std::experimental;
+namespace exper = std::experimental;
 
 int main(int, char**) {
     const char eight = '8';
@@ -31,28 +31,28 @@ int main(int, char**) {
     const int eleven = 11;
 
 //  Narrow streams w/rvalues
-    { exp::ostream_joiner<char>         oj(std::cout, '8'); }
-    { exp::ostream_joiner<std::string>  oj(std::cout, std::string("9")); }
-    { exp::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); }
-    { exp::ostream_joiner<int>          oj(std::cout, 11); }
+    { exper::ostream_joiner<char>         oj(std::cout, '8'); }
+    { exper::ostream_joiner<std::string>  oj(std::cout, std::string("9")); }
+    { exper::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); }
+    { exper::ostream_joiner<int>          oj(std::cout, 11); }
 
 //  Narrow streams w/lvalues
-    { exp::ostream_joiner<char>         oj(std::cout, eight); }
-    { exp::ostream_joiner<std::string>  oj(std::cout, nine); }
-    { exp::ostream_joiner<std::wstring> oj(std::cout, ten); }
-    { exp::ostream_joiner<int>          oj(std::cout, eleven); }
+    { exper::ostream_joiner<char>         oj(std::cout, eight); }
+    { exper::ostream_joiner<std::string>  oj(std::cout, nine); }
+    { exper::ostream_joiner<std::wstring> oj(std::cout, ten); }
+    { exper::ostream_joiner<int>          oj(std::cout, eleven); }
 
 //  Wide streams w/rvalues
-    { exp::ostream_joiner<char, wchar_t>         oj(std::wcout, '8'); }
-    { exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9")); }
-    { exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); }
-    { exp::ostream_joiner<int, wchar_t>          oj(std::wcout, 11); }
+    { exper::ostream_joiner<char, wchar_t>         oj(std::wcout, '8'); }
+    { exper::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9")); }
+    { exper::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); }
+    { exper::ostream_joiner<int, wchar_t>          oj(std::wcout, 11); }
 
 //  Wide streams w/lvalues
-    { exp::ostream_joiner<char, wchar_t>         oj(std::wcout, eight); }
-    { exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, nine); }
-    { exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, ten); }
-    { exp::ostream_joiner<int, wchar_t>          oj(std::wcout, eleven); }
+    { exper::ostream_joiner<char, wchar_t>         oj(std::wcout, eight); }
+    { exper::ostream_joiner<std::string, wchar_t>  oj(std::wcout, nine); }
+    { exper::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, ten); }
+    { exper::ostream_joiner<int, wchar_t>          oj(std::wcout, eleven); }
 
     
   return 0;
diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.creation/make_ostream_joiner.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.creation/make_ostream_joiner.pass.cpp
index a2dab9a..950dc40 100644
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.creation/make_ostream_joiner.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.creation/make_ostream_joiner.pass.cpp
@@ -26,13 +26,13 @@
 #include "test_macros.h"
 #include "test_iterators.h"
 
-namespace exp = std::experimental;
+namespace exper = std::experimental;
 
 template <class Delim, class Iter, class CharT = char, class Traits = std::char_traits<CharT>>
 void test (Delim &&d, Iter first, Iter last, const CharT *expected ) {
     std::basic_stringstream<CharT, Traits> sstream;
-    auto joiner = exp::make_ostream_joiner(sstream, d);
-    typedef exp::ostream_joiner<typename std::decay<Delim>::type, CharT, Traits> Joiner;
+    auto joiner = exper::make_ostream_joiner(sstream, d);
+    typedef exper::ostream_joiner<typename std::decay<Delim>::type, CharT, Traits> Joiner;
     static_assert((std::is_same<decltype(joiner), Joiner>::value), "" );
     while (first != last)
         joiner = *first++;
diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
index c1bf74a..fc62ba0 100644
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
@@ -49,11 +49,11 @@ operator<<(std::basic_ostream<_CharT, _Traits>& os, mutating_delimiter2 &d)
 { return os << d.get(); }
 
 
-namespace exp = std::experimental;
+namespace exper = std::experimental;
 
 template <class Delim, class Iter, class CharT = char, class Traits = std::char_traits<CharT>>
 void test (Delim &&d, Iter first, Iter last, const CharT *expected ) {
-    typedef exp::ostream_joiner<typename std::decay<Delim>::type, CharT, Traits> Joiner;
+    typedef exper::ostream_joiner<typename std::decay<Delim>::type, CharT, Traits> Joiner;
 
     static_assert((std::is_copy_constructible<Joiner>::value == std::is_copy_constructible<typename std::decay<Delim>::type>::value), "" );
     static_assert((std::is_move_constructible<Joiner>::value == std::is_move_constructible<typename std::decay<Delim>::type>::value), "" );
diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.postincrement.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.postincrement.pass.cpp
index 095020e..a23da34 100644
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.postincrement.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.postincrement.pass.cpp
@@ -22,26 +22,26 @@
 
 #include "test_macros.h"
 
-namespace exp = std::experimental;
+namespace exper = std::experimental;
 
 template <class Delim, class CharT, class Traits>
-void test ( exp::ostream_joiner<Delim, CharT, Traits> &oj ) {
+void test ( exper::ostream_joiner<Delim, CharT, Traits> &oj ) {
     static_assert((noexcept(oj++)), "" );
-    exp::ostream_joiner<Delim, CharT, Traits> &ret = oj++;
+    exper::ostream_joiner<Delim, CharT, Traits> &ret = oj++;
     assert( &ret == &oj );
     }
 
 int main(int, char**) {
 
-    { exp::ostream_joiner<char>         oj(std::cout, '8');                 test(oj); }
-    { exp::ostream_joiner<std::string>  oj(std::cout, std::string("9"));    test(oj); }
-    { exp::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); test(oj); }
-    { exp::ostream_joiner<int>          oj(std::cout, 11);                  test(oj); }
+    { exper::ostream_joiner<char>         oj(std::cout, '8');                 test(oj); }
+    { exper::ostream_joiner<std::string>  oj(std::cout, std::string("9"));    test(oj); }
+    { exper::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); test(oj); }
+    { exper::ostream_joiner<int>          oj(std::cout, 11);                  test(oj); }
 
-    { exp::ostream_joiner<char, wchar_t>         oj(std::wcout, '8');                 test(oj); }
-    { exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9"));    test(oj); }
-    { exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); test(oj); }
-    { exp::ostream_joiner<int, wchar_t>          oj(std::wcout, 11);                  test(oj); }
+    { exper::ostream_joiner<char, wchar_t>         oj(std::wcout, '8');                 test(oj); }
+    { exper::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9"));    test(oj); }
+    { exper::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); test(oj); }
+    { exper::ostream_joiner<int, wchar_t>          oj(std::wcout, 11);                  test(oj); }
     
   return 0;
 }
diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.pretincrement.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.pretincrement.pass.cpp
index 2e305c2..b6a915f 100644
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.pretincrement.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.pretincrement.pass.cpp
@@ -22,26 +22,26 @@
 
 #include "test_macros.h"
 
-namespace exp = std::experimental;
+namespace exper = std::experimental;
 
 template <class Delim, class CharT, class Traits>
-void test ( exp::ostream_joiner<Delim, CharT, Traits> &oj ) {
+void test ( exper::ostream_joiner<Delim, CharT, Traits> &oj ) {
     static_assert((noexcept(++oj)), "" );
-    exp::ostream_joiner<Delim, CharT, Traits> &ret = ++oj;
+    exper::ostream_joiner<Delim, CharT, Traits> &ret = ++oj;
     assert( &ret == &oj );
     }
 
 int main(int, char**) {
 
-    { exp::ostream_joiner<char>         oj(std::cout, '8');                 test(oj); }
-    { exp::ostream_joiner<std::string>  oj(std::cout, std::string("9"));    test(oj); }
-    { exp::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); test(oj); }
-    { exp::ostream_joiner<int>          oj(std::cout, 11);                  test(oj); }
+    { exper::ostream_joiner<char>         oj(std::cout, '8');                 test(oj); }
+    { exper::ostream_joiner<std::string>  oj(std::cout, std::string("9"));    test(oj); }
+    { exper::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); test(oj); }
+    { exper::ostream_joiner<int>          oj(std::cout, 11);                  test(oj); }
 
-    { exp::ostream_joiner<char, wchar_t>         oj(std::wcout, '8');                 test(oj); }
-    { exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9"));    test(oj); }
-    { exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); test(oj); }
-    { exp::ostream_joiner<int, wchar_t>          oj(std::wcout, 11);                  test(oj); }
+    { exper::ostream_joiner<char, wchar_t>         oj(std::wcout, '8');                 test(oj); }
+    { exper::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9"));    test(oj); }
+    { exper::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); test(oj); }
+    { exper::ostream_joiner<int, wchar_t>          oj(std::wcout, 11);                  test(oj); }
     
   return 0;
 }
diff --git a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.star.pass.cpp b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.star.pass.cpp
index 74bf9c3..0c2761a 100644
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.star.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.star.pass.cpp
@@ -22,26 +22,26 @@
 
 #include "test_macros.h"
 
-namespace exp = std::experimental;
+namespace exper = std::experimental;
 
 template <class Delim, class CharT, class Traits>
-void test ( exp::ostream_joiner<Delim, CharT, Traits> &oj ) {
+void test ( exper::ostream_joiner<Delim, CharT, Traits> &oj ) {
     static_assert((noexcept(*oj)), "" );
-    exp::ostream_joiner<Delim, CharT, Traits> &ret = *oj;
+    exper::ostream_joiner<Delim, CharT, Traits> &ret = *oj;
     assert( &ret == &oj );
     }
 
 int main(int, char**) {
 
-    { exp::ostream_joiner<char>         oj(std::cout, '8');                 test(oj); }
-    { exp::ostream_joiner<std::string>  oj(std::cout, std::string("9"));    test(oj); }
-    { exp::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); test(oj); }
-    { exp::ostream_joiner<int>          oj(std::cout, 11);                  test(oj); }
+    { exper::ostream_joiner<char>         oj(std::cout, '8');                 test(oj); }
+    { exper::ostream_joiner<std::string>  oj(std::cout, std::string("9"));    test(oj); }
+    { exper::ostream_joiner<std::wstring> oj(std::cout, std::wstring(L"10")); test(oj); }
+    { exper::ostream_joiner<int>          oj(std::cout, 11);                  test(oj); }
 
-    { exp::ostream_joiner<char, wchar_t>         oj(std::wcout, '8');                 test(oj); }
-    { exp::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9"));    test(oj); }
-    { exp::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); test(oj); }
-    { exp::ostream_joiner<int, wchar_t>          oj(std::wcout, 11);                  test(oj); }
+    { exper::ostream_joiner<char, wchar_t>         oj(std::wcout, '8');                 test(oj); }
+    { exper::ostream_joiner<std::string, wchar_t>  oj(std::wcout, std::string("9"));    test(oj); }
+    { exper::ostream_joiner<std::wstring, wchar_t> oj(std::wcout, std::wstring(L"10")); test(oj); }
+    { exper::ostream_joiner<int, wchar_t>          oj(std::wcout, 11);                  test(oj); }
     
   return 0;
 }