aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/testsuite/demangle
diff options
context:
space:
mode:
Diffstat (limited to 'libstdc++-v3/testsuite/demangle')
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/01.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/02.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/03.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/04.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/05.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/06.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/07.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/08.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/09.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/10.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/11.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/12.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/13.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/14.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/15.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/16.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/17.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/18.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/19.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/20.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/21.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/22.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/23.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/24.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/25.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_examples/26.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/01.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/02.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/03.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/04.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/05.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/06.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/07.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/08.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/09.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/10.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/11.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/12.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/13.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/abi_text/14.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/3111-1.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/3111-2.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-01.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-02.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-03.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-04.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-05.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-06.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-07.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-08.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-09.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-10.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-11.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986-12.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/7986.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/8897.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-01.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-02.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-03.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-04.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-05.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-06.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-07.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-08.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-09.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-10.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-11.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-12.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-13.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/cw-14.cc2
-rw-r--r--libstdc++-v3/testsuite/demangle/regression/old.cc2
71 files changed, 71 insertions, 71 deletions
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/01.cc b/libstdc++-v3/testsuite/demangle/abi_examples/01.cc
index 8ce9ee3da4c..585cfe0435c 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/01.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/01.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// extern "C" function
// extern "C" float f(void) { };
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/02.cc b/libstdc++-v3/testsuite/demangle/abi_examples/02.cc
index 44558e1faed..ce33e53894a 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/02.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/02.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// or variable "f"
// int f;
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/03.cc b/libstdc++-v3/testsuite/demangle/abi_examples/03.cc
index f807189fb09..a33fe48e4f9 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/03.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/03.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// or a global namespace variable "f"
/*
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/04.cc b/libstdc++-v3/testsuite/demangle/abi_examples/04.cc
index 7705d8d7117..0c8e9da6cc9 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/04.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/04.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// void f() { };
// int f() { };
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/05.cc b/libstdc++-v3/testsuite/demangle/abi_examples/05.cc
index 927b7e11d49..673a773d115 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/05.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/05.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// void f(int) { };
// int f(int) { };
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/06.cc b/libstdc++-v3/testsuite/demangle/abi_examples/06.cc
index 47f07a3096f..a016170a866 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/06.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/06.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// class bar { };
// void foo(bar) { };
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/07.cc b/libstdc++-v3/testsuite/demangle/abi_examples/07.cc
index e73c3dd5b93..b6943f222c3 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/07.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/07.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// class X { };
// int operator%(X, X) { };
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/08.cc b/libstdc++-v3/testsuite/demangle/abi_examples/08.cc
index 74394dc00bd..66b8dcb3e1c 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/08.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/08.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// int operator+(X&, X&) { };
verify_demangle("_ZplR1XS0_", "operator+(X&, X&)"); // XXX
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/09.cc b/libstdc++-v3/testsuite/demangle/abi_examples/09.cc
index 8e56b104ab2..c014936f3ca 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/09.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/09.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// int operator<< (X const&, X const&) { };
verify_demangle("_ZlsRK1XS1_", "operator<<(X const&, X const&)");
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/10.cc b/libstdc++-v3/testsuite/demangle/abi_examples/10.cc
index 597e83bbae8..fc422a7cd04 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/10.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/10.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
template<typename T>
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/11.cc b/libstdc++-v3/testsuite/demangle/abi_examples/11.cc
index 7201afbee55..abf547cc7bb 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/11.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/11.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// template<typename T> void f(int) { }
// template void f<int>(int);
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/12.cc b/libstdc++-v3/testsuite/demangle/abi_examples/12.cc
index c0c31a21f59..f0460fa4096 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/12.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/12.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
class Duo { };
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/13.cc b/libstdc++-v3/testsuite/demangle/abi_examples/13.cc
index 43aae1f34b3..79240561a1c 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/13.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/13.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
class Duo { };
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/14.cc b/libstdc++-v3/testsuite/demangle/abi_examples/14.cc
index 4bb70f643e0..26cf382374f 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/14.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/14.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
typedef void fun(double);
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/15.cc b/libstdc++-v3/testsuite/demangle/abi_examples/15.cc
index b79f1cc859e..0adb9a20a23 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/15.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/15.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
namespace N
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/16.cc b/libstdc++-v3/testsuite/demangle/abi_examples/16.cc
index 5afc643a304..c13cf6cbc05 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/16.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/16.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
namespace System
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/17.cc b/libstdc++-v3/testsuite/demangle/abi_examples/17.cc
index e9ce1058673..dd9bc7815f2 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/17.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/17.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
namespace Arena
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/18.cc b/libstdc++-v3/testsuite/demangle/abi_examples/18.cc
index 847568ca89c..3989da573b6 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/18.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/18.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
template<typename T1, typename T2> struct Stack
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/19.cc b/libstdc++-v3/testsuite/demangle/abi_examples/19.cc
index f70a389f5bc..21d18342bf3 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/19.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/19.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_Z1fI1XEvPVN1AIT_E1TE", "void f<X>(A<X>::T volatile*)");
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/20.cc b/libstdc++-v3/testsuite/demangle/abi_examples/20.cc
index 99517157437..a528b4318a6 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/20.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/20.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_ZngILi42EEvN1AIXplT_Li2EEE1TE",
"void operator-<42>(A<(42) + (2)>::T)");
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/21.cc b/libstdc++-v3/testsuite/demangle/abi_examples/21.cc
index debeb790fd2..ad186115596 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/21.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/21.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_Z4makeI7FactoryiET_IT0_Ev",
"Factory<int> make<Factory, int>()");
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/22.cc b/libstdc++-v3/testsuite/demangle/abi_examples/22.cc
index debeb790fd2..ad186115596 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/22.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/22.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_Z4makeI7FactoryiET_IT0_Ev",
"Factory<int> make<Factory, int>()");
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/23.cc b/libstdc++-v3/testsuite/demangle/abi_examples/23.cc
index 02f55a8cffc..4e3961afd08 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/23.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/23.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_Z3foo5Hello5WorldS0_S_",
"foo(Hello, World, World, Hello)");
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/24.cc b/libstdc++-v3/testsuite/demangle/abi_examples/24.cc
index e200574e873..888d5eb1729 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/24.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/24.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_Z3fooPM2ABi", "foo(int AB::**)");
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/25.cc b/libstdc++-v3/testsuite/demangle/abi_examples/25.cc
index 04ba05bad96..3bb2b3f19fe 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/25.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/25.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// Equivalent
// uncompressed, cp-dem
diff --git a/libstdc++-v3/testsuite/demangle/abi_examples/26.cc b/libstdc++-v3/testsuite/demangle/abi_examples/26.cc
index 075a80515cb..6f7f83e589c 100644
--- a/libstdc++-v3/testsuite/demangle/abi_examples/26.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_examples/26.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_ZTI7a_class", "typeinfo for a_class");
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/01.cc b/libstdc++-v3/testsuite/demangle/abi_text/01.cc
index f26ec7c615e..33cfd01ac0b 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/01.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/01.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi-examples.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// 5.1.5 Type encodings.
// int* volatile const restrict _far p;
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/02.cc b/libstdc++-v3/testsuite/demangle/abi_text/02.cc
index 210ad98e687..aedf031c6b9 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/02.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/02.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// template<int I> void foo (int (&)[I + 1]) { };
// template void foo<2> (int (&)[3]);
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/03.cc b/libstdc++-v3/testsuite/demangle/abi_text/03.cc
index 678fd287244..c880ae12b50 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/03.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/03.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// struct A;
// void f (void (A::*)() const) {}
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/04.cc b/libstdc++-v3/testsuite/demangle/abi_text/04.cc
index 66f739fffc2..2a7c8f6a2be 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/04.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/04.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// void foo(char);
verify_demangle("_Z3fooc", "foo(char)");
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/05.cc b/libstdc++-v3/testsuite/demangle/abi_text/05.cc
index ddada2cdbb3..4dec5d3b8eb 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/05.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/05.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// void foo(char);
// template<void (&)(char)> struct CB { };
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/06.cc b/libstdc++-v3/testsuite/demangle/abi_text/06.cc
index 01b09b407c6..1dc2d4f804c 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/06.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/06.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// extern "C" bool IsEmpty(char *);
// template<void (&)(char *)> struct CB;
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/07.cc b/libstdc++-v3/testsuite/demangle/abi_text/07.cc
index 2005dde6baf..3502e2ea629 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/07.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/07.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// 5.1.6 Scope Encoding
/*
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/08.cc b/libstdc++-v3/testsuite/demangle/abi_text/08.cc
index f85ef438429..00398478fb2 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/08.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/08.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// encoding of N::f::"Itanium C++ ABI" (no discriminator)
verify_demangle("_ZZN1N1fEiEs", "N::f(int)::string literal");
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/09.cc b/libstdc++-v3/testsuite/demangle/abi_text/09.cc
index 66f03076f2a..97b2c64a286 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/09.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/09.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// encoding of N::f::X::g()
// (third local mangled entity used as a class-qualifier)
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/10.cc b/libstdc++-v3/testsuite/demangle/abi_text/10.cc
index 82f7392b23e..de44769d85f 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/10.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/10.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_ZNZN1N1fEiE1X1gEv",
"error code = -2: invalid mangled name");
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/11.cc b/libstdc++-v3/testsuite/demangle/abi_text/11.cc
index 7eed78762bf..aa349f578c8 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/11.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/11.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// 5.1.7 Compression.
// typedef void T();
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/12.cc b/libstdc++-v3/testsuite/demangle/abi_text/12.cc
index 25c92c54daf..d19317ce03a 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/12.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/12.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// N::T<int, int>::mf(N::T<double, double>)
verify_demangle("_ZN1N1TIiiE2mfES0_IddE",
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/13.cc b/libstdc++-v3/testsuite/demangle/abi_text/13.cc
index 63a64e0d47d..da765f078c0 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/13.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/13.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// std::state
verify_demangle("_ZSt5state", "std::state");
diff --git a/libstdc++-v3/testsuite/demangle/abi_text/14.cc b/libstdc++-v3/testsuite/demangle/abi_text/14.cc
index 358c6e1a633..9cd854a8771 100644
--- a/libstdc++-v3/testsuite/demangle/abi_text/14.cc
+++ b/libstdc++-v3/testsuite/demangle/abi_text/14.cc
@@ -26,7 +26,7 @@
// http://www.codesourcery.com/cxx-abi/abi.html#mangling
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// std::_In::ward
verify_demangle("_ZNSt3_In4wardE", "std::_In::ward");
diff --git a/libstdc++-v3/testsuite/demangle/regression/3111-1.cc b/libstdc++-v3/testsuite/demangle/regression/3111-1.cc
index 6e7d702c289..38a27ece499 100644
--- a/libstdc++-v3/testsuite/demangle/regression/3111-1.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/3111-1.cc
@@ -25,7 +25,7 @@
// c++/3111
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_Z1fKPFiiE", "f(int (* const)(int))");
diff --git a/libstdc++-v3/testsuite/demangle/regression/3111-2.cc b/libstdc++-v3/testsuite/demangle/regression/3111-2.cc
index fe6ceb3abed..8897c5069a1 100644
--- a/libstdc++-v3/testsuite/demangle/regression/3111-2.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/3111-2.cc
@@ -25,7 +25,7 @@
// c++/3111
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
// icc FAIL
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-01.cc b/libstdc++-v3/testsuite/demangle/regression/7986-01.cc
index f05f097fe2f..e864957db39 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-01.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-01.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
verify_demangle("_Z1fA37_iPS_", "f(int[37], int (*) [37])");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-02.cc b/libstdc++-v3/testsuite/demangle/regression/7986-02.cc
index ae9d945cb01..7a10b0fd982 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-02.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-02.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// Equivalent, but formatting difference in void argument.
// verify_demangle("_Z1fM1AFivEPS0_", "f(int (A::*)(void), int (*)(void))");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-03.cc b/libstdc++-v3/testsuite/demangle/regression/7986-03.cc
index 2596f9aa161..02fc75b3e74 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-03.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-03.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
verify_demangle("_Z1fPFPA1_ivE", "f(int (*(*)()) [1])");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-04.cc b/libstdc++-v3/testsuite/demangle/regression/7986-04.cc
index 23d1f1f9cd6..5c4acbf1b22 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-04.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-04.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
verify_demangle("_Z1fPKM1AFivE", "f(int (A::* const*)())");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-05.cc b/libstdc++-v3/testsuite/demangle/regression/7986-05.cc
index b3393c903ff..e1216fc6376 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-05.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-05.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
verify_demangle("_Z1jM1AFivEPS1_", "j(int (A::*)(), int (A::**)())");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-06.cc b/libstdc++-v3/testsuite/demangle/regression/7986-06.cc
index 360c70c1cfe..12c0d8b08e6 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-06.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-06.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
verify_demangle("_Z1sPA37_iPS0_", "s(int (*) [37], int (**) [37])");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-07.cc b/libstdc++-v3/testsuite/demangle/regression/7986-07.cc
index 933c4c61e42..6a4dfb05024 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-07.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-07.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
verify_demangle("_Z3fooA30_A_i", "foo(int[30][])");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-08.cc b/libstdc++-v3/testsuite/demangle/regression/7986-08.cc
index 20800856518..a6a01cc32d5 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-08.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-08.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
verify_demangle("_Z3kooPA28_A30_i", "koo(int (*) [28][30])");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-09.cc b/libstdc++-v3/testsuite/demangle/regression/7986-09.cc
index 18a18b35c54..aef3ae2f6df 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-09.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-09.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
// Equivalent as considered order-insensitive?
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-10.cc b/libstdc++-v3/testsuite/demangle/regression/7986-10.cc
index ff7fa4c3a6c..9833b7233db 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-10.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-10.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("_ZlsRKU3fooU4bart1XS2_",
"operator<<(X bart foo const&, X bart foo const)");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-11.cc b/libstdc++-v3/testsuite/demangle/regression/7986-11.cc
index 49114d2c8ac..d2076ac58e3 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-11.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-11.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem FAIL
verify_demangle("_Z1fM1AKFivE", "f(int (A::*)() const)");
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986-12.cc b/libstdc++-v3/testsuite/demangle/regression/7986-12.cc
index 64a400f781f..97e76cc9af7 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986-12.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986-12.cc
@@ -25,7 +25,7 @@
// libstdc++/7986
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// ICE on figmative float template parameters?
/*
diff --git a/libstdc++-v3/testsuite/demangle/regression/7986.cc b/libstdc++-v3/testsuite/demangle/regression/7986.cc
index 05fa6a71c29..42f2139089b 100644
--- a/libstdc++-v3/testsuite/demangle/regression/7986.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/7986.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
return 0;
diff --git a/libstdc++-v3/testsuite/demangle/regression/8897.cc b/libstdc++-v3/testsuite/demangle/regression/8897.cc
index f40b90f30f6..ed68f33314d 100644
--- a/libstdc++-v3/testsuite/demangle/regression/8897.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/8897.cc
@@ -25,7 +25,7 @@
// c++/8897
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
template<typename T1>
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-01.cc b/libstdc++-v3/testsuite/demangle/regression/cw-01.cc
index cda35f6a808..3a8dbc2e8e0 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-01.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-01.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
class libcw_app_ct {
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-02.cc b/libstdc++-v3/testsuite/demangle/regression/cw-02.cc
index 7c0d613bee3..51f3807b186 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-02.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-02.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
namespace libcw {
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-03.cc b/libstdc++-v3/testsuite/demangle/regression/cw-03.cc
index 0ab62327e4e..ca846b9bc7e 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-03.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-03.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
namespace libcw {
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-04.cc b/libstdc++-v3/testsuite/demangle/regression/cw-04.cc
index d2a7c09cdbc..27eb55854af 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-04.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-04.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-05.cc b/libstdc++-v3/testsuite/demangle/regression/cw-05.cc
index e56c834aeb5..5c9e25f4a50 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-05.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-05.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
struct memory_block_st { };
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-06.cc b/libstdc++-v3/testsuite/demangle/regression/cw-06.cc
index 5c22d177d9b..943a7163732 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-06.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-06.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
struct option { };
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-07.cc b/libstdc++-v3/testsuite/demangle/regression/cw-07.cc
index 25f3661fe50..a34e6f87ffe 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-07.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-07.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-08.cc b/libstdc++-v3/testsuite/demangle/regression/cw-08.cc
index 25280a5151c..5bd2cf2892a 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-08.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-08.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
class A { };
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-09.cc b/libstdc++-v3/testsuite/demangle/regression/cw-09.cc
index 0ad38f1d291..3da7fe861c0 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-09.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-09.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-10.cc b/libstdc++-v3/testsuite/demangle/regression/cw-10.cc
index ab0da2af05f..c4efcd30bf1 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-10.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-10.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-11.cc b/libstdc++-v3/testsuite/demangle/regression/cw-11.cc
index d763e8c56af..e5405b2f6e9 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-11.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-11.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem CORE
verify_demangle("_X11TransParseAddress", "_X11TransParseAddress");
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-12.cc b/libstdc++-v3/testsuite/demangle/regression/cw-12.cc
index cb6a40ee548..8838a8a1c2b 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-12.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-12.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
namespace std {
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-13.cc b/libstdc++-v3/testsuite/demangle/regression/cw-13.cc
index 8fe07fd44a6..ec883be1de3 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-13.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-13.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
// cplus-dem CORE
verify_demangle("_GLOBAL__I__Z2fnv", "global constructors keyed to fn()");
diff --git a/libstdc++-v3/testsuite/demangle/regression/cw-14.cc b/libstdc++-v3/testsuite/demangle/regression/cw-14.cc
index 613c0c8b32c..84b6532d372 100644
--- a/libstdc++-v3/testsuite/demangle/regression/cw-14.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/cw-14.cc
@@ -25,7 +25,7 @@
// libcwd tests
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
/*
struct G {
diff --git a/libstdc++-v3/testsuite/demangle/regression/old.cc b/libstdc++-v3/testsuite/demangle/regression/old.cc
index 7bb8484d78c..d9313f9fd45 100644
--- a/libstdc++-v3/testsuite/demangle/regression/old.cc
+++ b/libstdc++-v3/testsuite/demangle/regression/old.cc
@@ -25,7 +25,7 @@
// old libiberty tests for gnu-v3
int main()
{
- using namespace __gnu_cxx_test;
+ using namespace __gnu_test;
verify_demangle("St9bad_alloc", "std::bad_alloc");
return 0;
}