From aecf642c785beeffc45043564f23778b21d48306 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Thu, 24 Jul 2003 21:08:03 +0000 Subject: [PATCH] *: Change __gnu_cxx_test to __gnu_test. 2003-07-24 Benjamin Kosnik * testsuite/*: Change __gnu_cxx_test to __gnu_test. From-SVN: r69761 --- libstdc++-v3/ChangeLog | 6 +++++- .../21_strings/basic_string/cons/char/1.cc | 2 +- .../21_strings/basic_string/cons/wchar_t/1.cc | 2 +- .../21_strings/basic_string/insert/char/1.cc | 2 +- .../21_strings/basic_string/insert/wchar_t/1.cc | 2 +- .../codecvt/always_noconv/char/wrapped_env.cc | 2 +- .../codecvt/always_noconv/char/wrapped_locale.cc | 2 +- .../22_locale/codecvt/always_noconv/wchar_t/2.cc | 2 +- .../22_locale/codecvt/always_noconv/wchar_t/3.cc | 2 +- .../22_locale/codecvt/always_noconv/wchar_t/4.cc | 2 +- .../codecvt/always_noconv/wchar_t/wrapped_env.cc | 2 +- .../always_noconv/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/codecvt/encoding/char/wrapped_env.cc | 2 +- .../codecvt/encoding/char/wrapped_locale.cc | 2 +- .../22_locale/codecvt/encoding/wchar_t/2.cc | 2 +- .../22_locale/codecvt/encoding/wchar_t/3.cc | 2 +- .../22_locale/codecvt/encoding/wchar_t/4.cc | 2 +- .../codecvt/encoding/wchar_t/wrapped_env.cc | 2 +- .../codecvt/encoding/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/codecvt/in/char/wrapped_env.cc | 2 +- .../22_locale/codecvt/in/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/codecvt/in/wchar_t/2.cc | 2 +- .../testsuite/22_locale/codecvt/in/wchar_t/3.cc | 2 +- .../testsuite/22_locale/codecvt/in/wchar_t/4.cc | 2 +- .../testsuite/22_locale/codecvt/in/wchar_t/7.cc | 2 +- .../testsuite/22_locale/codecvt/in/wchar_t/8.cc | 2 +- .../testsuite/22_locale/codecvt/in/wchar_t/9.cc | 2 +- .../22_locale/codecvt/in/wchar_t/wrapped_env.cc | 2 +- .../22_locale/codecvt/in/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/codecvt/length/char/wrapped_env.cc | 2 +- .../codecvt/length/char/wrapped_locale.cc | 2 +- .../22_locale/codecvt/length/wchar_t/2.cc | 2 +- .../22_locale/codecvt/length/wchar_t/3.cc | 2 +- .../22_locale/codecvt/length/wchar_t/4.cc | 2 +- .../22_locale/codecvt/length/wchar_t/7.cc | 2 +- .../codecvt/length/wchar_t/wrapped_env.cc | 2 +- .../codecvt/length/wchar_t/wrapped_locale.cc | 2 +- .../codecvt/max_length/char/wrapped_env.cc | 2 +- .../codecvt/max_length/char/wrapped_locale.cc | 2 +- .../22_locale/codecvt/max_length/wchar_t/2.cc | 2 +- .../22_locale/codecvt/max_length/wchar_t/3.cc | 2 +- .../22_locale/codecvt/max_length/wchar_t/4.cc | 2 +- .../codecvt/max_length/wchar_t/wrapped_env.cc | 2 +- .../codecvt/max_length/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/codecvt/out/char/wrapped_env.cc | 2 +- .../22_locale/codecvt/out/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/codecvt/out/wchar_t/2.cc | 2 +- .../testsuite/22_locale/codecvt/out/wchar_t/3.cc | 2 +- .../testsuite/22_locale/codecvt/out/wchar_t/4.cc | 2 +- .../testsuite/22_locale/codecvt/out/wchar_t/7.cc | 2 +- .../22_locale/codecvt/out/wchar_t/wrapped_env.cc | 2 +- .../codecvt/out/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/codecvt/unshift/char/wrapped_env.cc | 2 +- .../codecvt/unshift/char/wrapped_locale.cc | 2 +- .../22_locale/codecvt/unshift/wchar_t/2.cc | 2 +- .../22_locale/codecvt/unshift/wchar_t/3.cc | 2 +- .../22_locale/codecvt/unshift/wchar_t/4.cc | 2 +- .../codecvt/unshift/wchar_t/wrapped_env.cc | 2 +- .../codecvt/unshift/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/collate/compare/char/1.cc | 6 +++--- .../testsuite/22_locale/collate/compare/char/2.cc | 6 +++--- .../testsuite/22_locale/collate/compare/char/3.cc | 2 +- .../22_locale/collate/compare/char/wrapped_env.cc | 2 +- .../collate/compare/char/wrapped_locale.cc | 2 +- .../22_locale/collate/compare/wchar_t/1.cc | 6 +++--- .../22_locale/collate/compare/wchar_t/2.cc | 6 +++--- .../22_locale/collate/compare/wchar_t/3.cc | 2 +- .../collate/compare/wchar_t/wrapped_env.cc | 2 +- .../collate/compare/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/collate/hash/char/2.cc | 6 +++--- .../22_locale/collate/hash/char/wrapped_env.cc | 2 +- .../22_locale/collate/hash/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/collate/hash/wchar_t/2.cc | 6 +++--- .../22_locale/collate/hash/wchar_t/wrapped_env.cc | 2 +- .../collate/hash/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/collate/transform/char/2.cc | 6 +++--- .../22_locale/collate/transform/char/3.cc | 2 +- .../collate/transform/char/wrapped_env.cc | 2 +- .../collate/transform/char/wrapped_locale.cc | 2 +- .../22_locale/collate/transform/wchar_t/2.cc | 6 +++--- .../22_locale/collate/transform/wchar_t/3.cc | 2 +- .../collate/transform/wchar_t/wrapped_env.cc | 2 +- .../collate/transform/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/collate_byname/1.cc | 2 +- .../22_locale/ctype/cons/char/wrapped_env.cc | 2 +- .../22_locale/ctype/cons/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/ctype/is/char/2.cc | 2 +- .../22_locale/ctype/is/char/wrapped_env.cc | 2 +- .../22_locale/ctype/is/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/ctype/is/wchar_t/2.cc | 2 +- .../22_locale/ctype/is/wchar_t/wrapped_env.cc | 2 +- .../22_locale/ctype/is/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/ctype/narrow/char/wrapped_env.cc | 2 +- .../22_locale/ctype/narrow/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/ctype/narrow/wchar_t/3.cc | 2 +- .../22_locale/ctype/narrow/wchar_t/wrapped_env.cc | 2 +- .../ctype/narrow/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/ctype/scan/char/wrapped_env.cc | 2 +- .../22_locale/ctype/scan/char/wrapped_locale.cc | 2 +- .../22_locale/ctype/scan/wchar_t/wrapped_env.cc | 2 +- .../22_locale/ctype/scan/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/ctype/to/char/wrapped_env.cc | 2 +- .../22_locale/ctype/to/char/wrapped_locale.cc | 2 +- .../22_locale/ctype/to/wchar_t/wrapped_env.cc | 2 +- .../22_locale/ctype/to/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/ctype/widen/char/wrapped_env.cc | 2 +- .../22_locale/ctype/widen/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/ctype/widen/wchar_t/2.cc | 2 +- .../testsuite/22_locale/ctype/widen/wchar_t/3.cc | 2 +- .../22_locale/ctype/widen/wchar_t/wrapped_env.cc | 2 +- .../ctype/widen/wchar_t/wrapped_locale.cc | 2 +- libstdc++-v3/testsuite/22_locale/facet/2.cc | 2 +- libstdc++-v3/testsuite/22_locale/locale/cons/2.cc | 2 +- libstdc++-v3/testsuite/22_locale/locale/cons/4.cc | 2 +- libstdc++-v3/testsuite/22_locale/locale/cons/5.cc | 14 +++++++------- libstdc++-v3/testsuite/22_locale/locale/cons/7.cc | 2 +- .../testsuite/22_locale/locale/cons/7222-env.cc | 4 ++-- .../22_locale/locale/global_locale_objects/2.cc | 8 ++++---- .../testsuite/22_locale/messages/members/char/1.cc | 6 +++--- .../testsuite/22_locale/messages/members/char/2.cc | 6 +++--- .../testsuite/22_locale/messages/members/char/3.cc | 6 +++--- .../22_locale/messages/members/char/wrapped_env.cc | 2 +- .../messages/members/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/messages_byname/1.cc | 2 +- .../testsuite/22_locale/money_get/get/char/1.cc | 6 +++--- .../22_locale/money_get/get/char/11528.cc | 2 +- .../testsuite/22_locale/money_get/get/char/2.cc | 6 +++--- .../testsuite/22_locale/money_get/get/char/3.cc | 6 +++--- .../testsuite/22_locale/money_get/get/char/4.cc | 6 +++--- .../22_locale/money_get/get/char/wrapped_env.cc | 2 +- .../22_locale/money_get/get/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/money_get/get/wchar_t/1.cc | 6 +++--- .../22_locale/money_get/get/wchar_t/11528.cc | 2 +- .../testsuite/22_locale/money_get/get/wchar_t/2.cc | 6 +++--- .../testsuite/22_locale/money_get/get/wchar_t/3.cc | 6 +++--- .../testsuite/22_locale/money_get/get/wchar_t/4.cc | 6 +++--- .../22_locale/money_get/get/wchar_t/wrapped_env.cc | 2 +- .../money_get/get/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/money_put/put/char/1.cc | 6 +++--- .../testsuite/22_locale/money_put/put/char/2.cc | 6 +++--- .../testsuite/22_locale/money_put/put/char/3.cc | 6 +++--- .../22_locale/money_put/put/char/wrapped_env.cc | 2 +- .../22_locale/money_put/put/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/money_put/put/wchar_t/1.cc | 6 +++--- .../testsuite/22_locale/money_put/put/wchar_t/2.cc | 6 +++--- .../testsuite/22_locale/money_put/put/wchar_t/3.cc | 6 +++--- .../22_locale/money_put/put/wchar_t/wrapped_env.cc | 2 +- .../money_put/put/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/moneypunct/members/char/2.cc | 2 +- .../moneypunct/members/char/wrapped_env.cc | 2 +- .../moneypunct/members/char/wrapped_locale.cc | 2 +- .../22_locale/moneypunct/members/wchar_t/2.cc | 2 +- .../moneypunct/members/wchar_t/wrapped_env.cc | 2 +- .../moneypunct/members/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/moneypunct_byname/1.cc | 2 +- .../testsuite/22_locale/num_get/get/char/1.cc | 6 +++--- .../testsuite/22_locale/num_get/get/char/2.cc | 6 +++--- .../testsuite/22_locale/num_get/get/char/3.cc | 6 +++--- .../testsuite/22_locale/num_get/get/char/5.cc | 2 +- .../testsuite/22_locale/num_get/get/char/6.cc | 2 +- .../22_locale/num_get/get/char/wrapped_env.cc | 2 +- .../22_locale/num_get/get/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/num_get/get/wchar_t/1.cc | 6 +++--- .../testsuite/22_locale/num_get/get/wchar_t/2.cc | 6 +++--- .../testsuite/22_locale/num_get/get/wchar_t/3.cc | 6 +++--- .../testsuite/22_locale/num_get/get/wchar_t/5.cc | 2 +- .../testsuite/22_locale/num_get/get/wchar_t/6.cc | 2 +- .../22_locale/num_get/get/wchar_t/wrapped_env.cc | 2 +- .../num_get/get/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/num_put/put/char/1.cc | 6 +++--- .../testsuite/22_locale/num_put/put/char/2.cc | 6 +++--- .../testsuite/22_locale/num_put/put/char/3.cc | 6 +++--- .../testsuite/22_locale/num_put/put/char/5.cc | 2 +- .../22_locale/num_put/put/char/wrapped_env.cc | 2 +- .../22_locale/num_put/put/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/num_put/put/wchar_t/1.cc | 6 +++--- .../testsuite/22_locale/num_put/put/wchar_t/2.cc | 6 +++--- .../testsuite/22_locale/num_put/put/wchar_t/3.cc | 6 +++--- .../testsuite/22_locale/num_put/put/wchar_t/5.cc | 2 +- .../22_locale/num_put/put/wchar_t/wrapped_env.cc | 2 +- .../num_put/put/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/numpunct/members/char/1.cc | 6 +++--- .../testsuite/22_locale/numpunct/members/char/2.cc | 6 +++--- .../22_locale/numpunct/members/char/wrapped_env.cc | 2 +- .../numpunct/members/char/wrapped_locale.cc | 2 +- .../22_locale/numpunct/members/wchar_t/1.cc | 6 +++--- .../22_locale/numpunct/members/wchar_t/2.cc | 6 +++--- .../numpunct/members/wchar_t/wrapped_env.cc | 2 +- .../numpunct/members/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/numpunct_byname/1.cc | 2 +- .../testsuite/22_locale/numpunct_byname/2.cc | 2 +- .../22_locale/time_get/date_order/char/1.cc | 6 +++--- .../time_get/date_order/char/wrapped_env.cc | 2 +- .../time_get/date_order/char/wrapped_locale.cc | 2 +- .../22_locale/time_get/date_order/wchar_t/1.cc | 6 +++--- .../time_get/date_order/wchar_t/wrapped_env.cc | 2 +- .../time_get/date_order/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_date/char/1.cc | 6 +++--- .../22_locale/time_get/get_date/char/2.cc | 6 +++--- .../time_get/get_date/char/wrapped_env.cc | 2 +- .../time_get/get_date/char/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_date/wchar_t/1.cc | 6 +++--- .../22_locale/time_get/get_date/wchar_t/2.cc | 6 +++--- .../time_get/get_date/wchar_t/wrapped_env.cc | 2 +- .../time_get/get_date/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_monthname/char/1.cc | 6 +++--- .../22_locale/time_get/get_monthname/char/2.cc | 6 +++--- .../time_get/get_monthname/char/wrapped_env.cc | 2 +- .../time_get/get_monthname/char/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_monthname/wchar_t/1.cc | 6 +++--- .../22_locale/time_get/get_monthname/wchar_t/2.cc | 6 +++--- .../time_get/get_monthname/wchar_t/wrapped_env.cc | 2 +- .../get_monthname/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_time/char/1.cc | 6 +++--- .../22_locale/time_get/get_time/char/2.cc | 6 +++--- .../time_get/get_time/char/wrapped_env.cc | 2 +- .../time_get/get_time/char/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_time/wchar_t/1.cc | 6 +++--- .../22_locale/time_get/get_time/wchar_t/2.cc | 6 +++--- .../time_get/get_time/wchar_t/wrapped_env.cc | 2 +- .../time_get/get_time/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_weekday/char/1.cc | 6 +++--- .../22_locale/time_get/get_weekday/char/2.cc | 6 +++--- .../time_get/get_weekday/char/wrapped_env.cc | 2 +- .../time_get/get_weekday/char/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_weekday/wchar_t/1.cc | 6 +++--- .../22_locale/time_get/get_weekday/wchar_t/2.cc | 6 +++--- .../time_get/get_weekday/wchar_t/wrapped_env.cc | 2 +- .../time_get/get_weekday/wchar_t/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_year/char/1.cc | 6 +++--- .../time_get/get_year/char/wrapped_env.cc | 2 +- .../time_get/get_year/char/wrapped_locale.cc | 2 +- .../22_locale/time_get/get_year/wchar_t/1.cc | 6 +++--- .../time_get/get_year/wchar_t/wrapped_env.cc | 2 +- .../time_get/get_year/wchar_t/wrapped_locale.cc | 2 +- .../testsuite/22_locale/time_put/put/char/1.cc | 6 +++--- .../testsuite/22_locale/time_put/put/char/2.cc | 6 +++--- .../testsuite/22_locale/time_put/put/char/3.cc | 6 +++--- .../testsuite/22_locale/time_put/put/char/4.cc | 6 +++--- .../testsuite/22_locale/time_put/put/char/5.cc | 6 +++--- .../testsuite/22_locale/time_put/put/char/6.cc | 6 +++--- .../testsuite/22_locale/time_put/put/char/7.cc | 6 +++--- .../testsuite/22_locale/time_put/put/char/8.cc | 6 +++--- .../22_locale/time_put/put/char/wrapped_env.cc | 2 +- .../22_locale/time_put/put/char/wrapped_locale.cc | 2 +- .../testsuite/22_locale/time_put/put/wchar_t/1.cc | 6 +++--- .../testsuite/22_locale/time_put/put/wchar_t/2.cc | 6 +++--- .../testsuite/22_locale/time_put/put/wchar_t/3.cc | 6 +++--- .../testsuite/22_locale/time_put/put/wchar_t/4.cc | 6 +++--- .../testsuite/22_locale/time_put/put/wchar_t/5.cc | 6 +++--- .../testsuite/22_locale/time_put/put/wchar_t/6.cc | 6 +++--- .../testsuite/22_locale/time_put/put/wchar_t/7.cc | 6 +++--- .../testsuite/22_locale/time_put/put/wchar_t/8.cc | 6 +++--- .../22_locale/time_put/put/wchar_t/wrapped_env.cc | 2 +- .../time_put/put/wchar_t/wrapped_locale.cc | 2 +- libstdc++-v3/testsuite/23_containers/deque_ctor.cc | 14 +++++++------- .../testsuite/23_containers/list_modifiers.cc | 2 +- .../testsuite/23_containers/vector_capacity.cc | 12 ++++++------ .../testsuite/23_containers/vector_ctor.cc | 10 +++++----- libstdc++-v3/testsuite/27_io/basic_filebuf/2.cc | 2 +- .../testsuite/27_io/basic_filebuf/imbue/char/2.cc | 2 +- .../27_io/basic_filebuf/imbue/char/9322.cc | 4 ++-- .../27_io/basic_filebuf/imbue/wchar_t/2.cc | 2 +- .../27_io/basic_filebuf/imbue/wchar_t/9322.cc | 4 ++-- .../basic_filebuf/overflow/wchar_t/11305-1.cc | 2 +- .../basic_filebuf/overflow/wchar_t/11305-2.cc | 2 +- .../basic_filebuf/overflow/wchar_t/11305-3.cc | 2 +- .../basic_filebuf/overflow/wchar_t/11305-4.cc | 2 +- .../27_io/basic_filebuf/sbumpc/char/1-in.cc | 2 +- .../27_io/basic_filebuf/sbumpc/char/1-io.cc | 2 +- .../27_io/basic_filebuf/sbumpc/char/1-out.cc | 2 +- .../27_io/basic_filebuf/sbumpc/char/2-in.cc | 2 +- .../27_io/basic_filebuf/sbumpc/char/2-io.cc | 2 +- .../27_io/basic_filebuf/sbumpc/char/2-out.cc | 2 +- .../27_io/basic_filebuf/seekoff/char/1-in.cc | 2 +- .../27_io/basic_filebuf/seekoff/char/1-io.cc | 2 +- .../27_io/basic_filebuf/seekoff/char/1-out.cc | 2 +- .../27_io/basic_filebuf/seekoff/char/2-in.cc | 2 +- .../27_io/basic_filebuf/seekoff/char/2-io.cc | 2 +- .../27_io/basic_filebuf/seekoff/char/2-out.cc | 2 +- .../27_io/basic_filebuf/seekpos/char/1-in.cc | 2 +- .../27_io/basic_filebuf/seekpos/char/1-io.cc | 2 +- .../27_io/basic_filebuf/seekpos/char/1-out.cc | 2 +- .../27_io/basic_filebuf/seekpos/char/2-in.cc | 2 +- .../27_io/basic_filebuf/seekpos/char/2-io.cc | 2 +- .../27_io/basic_filebuf/seekpos/char/2-out.cc | 2 +- .../27_io/basic_filebuf/sgetc/char/1-in.cc | 2 +- .../27_io/basic_filebuf/sgetc/char/1-io.cc | 2 +- .../27_io/basic_filebuf/sgetc/char/1-out.cc | 2 +- .../27_io/basic_filebuf/sgetc/char/2-in.cc | 2 +- .../27_io/basic_filebuf/sgetc/char/2-io.cc | 2 +- .../27_io/basic_filebuf/sgetc/char/2-out.cc | 2 +- .../27_io/basic_filebuf/sgetn/char/1-in.cc | 2 +- .../27_io/basic_filebuf/sgetn/char/1-io.cc | 2 +- .../27_io/basic_filebuf/sgetn/char/1-out.cc | 2 +- .../27_io/basic_filebuf/sgetn/char/2-in.cc | 2 +- .../27_io/basic_filebuf/sgetn/char/2-io.cc | 2 +- .../27_io/basic_filebuf/sgetn/char/2-out.cc | 2 +- .../27_io/basic_filebuf/snextc/char/1-in.cc | 2 +- .../27_io/basic_filebuf/snextc/char/1-io.cc | 2 +- .../27_io/basic_filebuf/snextc/char/1-out.cc | 2 +- .../27_io/basic_filebuf/snextc/char/2-in.cc | 2 +- .../27_io/basic_filebuf/snextc/char/2-io.cc | 2 +- .../27_io/basic_filebuf/snextc/char/2-out.cc | 2 +- .../27_io/basic_filebuf/sputbackc/char/1-in.cc | 2 +- .../27_io/basic_filebuf/sputbackc/char/1-io.cc | 2 +- .../27_io/basic_filebuf/sputbackc/char/1-out.cc | 2 +- .../27_io/basic_filebuf/sputbackc/char/2-in.cc | 2 +- .../27_io/basic_filebuf/sputbackc/char/2-io.cc | 2 +- .../27_io/basic_filebuf/sputbackc/char/2-out.cc | 2 +- .../27_io/basic_filebuf/sputc/char/1-in.cc | 2 +- .../27_io/basic_filebuf/sputc/char/1-io.cc | 2 +- .../27_io/basic_filebuf/sputc/char/1-out.cc | 2 +- .../27_io/basic_filebuf/sputc/char/2-in.cc | 2 +- .../27_io/basic_filebuf/sputc/char/2-io.cc | 2 +- .../27_io/basic_filebuf/sputc/char/2-out.cc | 2 +- .../27_io/basic_filebuf/sputn/char/1-in.cc | 2 +- .../27_io/basic_filebuf/sputn/char/1-io.cc | 2 +- .../27_io/basic_filebuf/sputn/char/1-out.cc | 2 +- .../27_io/basic_filebuf/sputn/char/2-in.cc | 2 +- .../27_io/basic_filebuf/sputn/char/2-io.cc | 2 +- .../27_io/basic_filebuf/sputn/char/2-out.cc | 2 +- .../27_io/basic_filebuf/sungetc/char/1-in.cc | 2 +- .../27_io/basic_filebuf/sungetc/char/1-io.cc | 2 +- .../27_io/basic_filebuf/sungetc/char/1-out.cc | 2 +- .../27_io/basic_filebuf/sungetc/char/2-in.cc | 2 +- .../27_io/basic_filebuf/sungetc/char/2-io.cc | 2 +- .../27_io/basic_filebuf/sungetc/char/2-out.cc | 2 +- .../basic_filebuf/underflow/wchar_t/11389-1.cc | 2 +- .../basic_filebuf/underflow/wchar_t/11389-2.cc | 2 +- .../basic_filebuf/underflow/wchar_t/11389-3.cc | 2 +- .../basic_filebuf/underflow/wchar_t/11389-4.cc | 2 +- .../27_io/basic_filebuf/underflow/wchar_t/9520.cc | 2 +- libstdc++-v3/testsuite/27_io/basic_fstream/2.cc | 2 +- .../testsuite/27_io/basic_ios/copyfmt/char/2.cc | 2 +- libstdc++-v3/testsuite/27_io/basic_istream/2.cc | 2 +- .../extractors_character/char/9826.cc | 2 +- libstdc++-v3/testsuite/27_io/basic_ostream/2.cc | 2 +- .../basic_ostream/inserters_arithmetic/char/2.cc | 2 +- libstdc++-v3/testsuite/27_io/basic_streambuf/2.cc | 2 +- .../27_io/basic_streambuf/imbue/char/9322.cc | 4 ++-- libstdc++-v3/testsuite/27_io/basic_stringbuf/1.cc | 2 +- libstdc++-v3/testsuite/27_io/basic_stringbuf/2.cc | 2 +- libstdc++-v3/testsuite/27_io/basic_stringbuf/4.cc | 4 ++-- .../27_io/basic_stringbuf/imbue/char/9322.cc | 4 ++-- .../testsuite/27_io/basic_stringstream/2.cc | 2 +- libstdc++-v3/testsuite/27_io/fpos/1.cc | 2 +- libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc | 2 +- libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc | 2 +- libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc | 2 +- libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc | 2 +- .../testsuite/27_io/objects/wchar_t/9520.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/01.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/02.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/03.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/04.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/05.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/06.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/07.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/08.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/09.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/10.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/11.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/12.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/13.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/14.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/15.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/16.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/17.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/18.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/19.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/20.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/21.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/22.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/23.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/24.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/25.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_examples/26.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/01.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/02.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/03.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/04.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/05.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/06.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/07.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/08.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/09.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/10.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/11.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/12.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/13.cc | 2 +- libstdc++-v3/testsuite/demangle/abi_text/14.cc | 2 +- .../testsuite/demangle/regression/3111-1.cc | 2 +- .../testsuite/demangle/regression/3111-2.cc | 2 +- .../testsuite/demangle/regression/7986-01.cc | 2 +- .../testsuite/demangle/regression/7986-02.cc | 2 +- .../testsuite/demangle/regression/7986-03.cc | 2 +- .../testsuite/demangle/regression/7986-04.cc | 2 +- .../testsuite/demangle/regression/7986-05.cc | 2 +- .../testsuite/demangle/regression/7986-06.cc | 2 +- .../testsuite/demangle/regression/7986-07.cc | 2 +- .../testsuite/demangle/regression/7986-08.cc | 2 +- .../testsuite/demangle/regression/7986-09.cc | 2 +- .../testsuite/demangle/regression/7986-10.cc | 2 +- .../testsuite/demangle/regression/7986-11.cc | 2 +- .../testsuite/demangle/regression/7986-12.cc | 2 +- libstdc++-v3/testsuite/demangle/regression/7986.cc | 2 +- libstdc++-v3/testsuite/demangle/regression/8897.cc | 2 +- .../testsuite/demangle/regression/cw-01.cc | 2 +- .../testsuite/demangle/regression/cw-02.cc | 2 +- .../testsuite/demangle/regression/cw-03.cc | 2 +- .../testsuite/demangle/regression/cw-04.cc | 2 +- .../testsuite/demangle/regression/cw-05.cc | 2 +- .../testsuite/demangle/regression/cw-06.cc | 2 +- .../testsuite/demangle/regression/cw-07.cc | 2 +- .../testsuite/demangle/regression/cw-08.cc | 2 +- .../testsuite/demangle/regression/cw-09.cc | 2 +- .../testsuite/demangle/regression/cw-10.cc | 2 +- .../testsuite/demangle/regression/cw-11.cc | 2 +- .../testsuite/demangle/regression/cw-12.cc | 2 +- .../testsuite/demangle/regression/cw-13.cc | 2 +- .../testsuite/demangle/regression/cw-14.cc | 2 +- libstdc++-v3/testsuite/demangle/regression/old.cc | 2 +- libstdc++-v3/testsuite/ext/stdio_filebuf.cc | 2 +- libstdc++-v3/testsuite/performance/allocator.cc | 2 +- libstdc++-v3/testsuite/performance/complex_norm.cc | 2 +- .../testsuite/performance/cout_insert_int.cc | 2 +- libstdc++-v3/testsuite/performance/filebuf_copy.cc | 2 +- .../testsuite/performance/filebuf_sputc.cc | 2 +- .../testsuite/performance/fstream_seek_write.cc | 2 +- .../testsuite/performance/ifstream_getline.cc | 2 +- .../testsuite/performance/list_create_fill_sort.cc | 2 +- .../testsuite/performance/map_create_fill.cc | 2 +- .../testsuite/performance/ofstream_insert_float.cc | 2 +- .../testsuite/performance/ofstream_insert_int.cc | 2 +- .../testsuite/performance/string_append.cc | 4 ++-- libstdc++-v3/testsuite/testsuite_allocator.cc | 2 +- libstdc++-v3/testsuite/testsuite_allocator.h | 4 ++-- libstdc++-v3/testsuite/testsuite_hooks.cc | 2 +- libstdc++-v3/testsuite/testsuite_hooks.h | 14 +++++++------- libstdc++-v3/testsuite/testsuite_io.h | 4 ++-- libstdc++-v3/testsuite/testsuite_performance.h | 4 ++-- 442 files changed, 640 insertions(+), 636 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4eaf1da7028..75dcdccbae2 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,8 @@ -2003-07-24 Nathan Myers +2003-07-24 Benjamin Kosnik + + * testsuite/*: Change __gnu_cxx_test to __gnu_test. + +2003-07-24 Nathan Myers * testsuite/23_containers/map_operators.cc: Conform to container requirement as value must be Assignable. diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc index 3c92910f312..8f673c89dbf 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/char/1.cc @@ -155,7 +155,7 @@ void test01(void) int main() { - __gnu_cxx_test::set_memory_limits(); + __gnu_test::set_memory_limits(); test01(); return 0; } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc index eeb3516d236..b1a5b6dd40a 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/cons/wchar_t/1.cc @@ -155,7 +155,7 @@ void test01(void) int main() { - __gnu_cxx_test::set_memory_limits(); + __gnu_test::set_memory_limits(); test01(); return 0; } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/insert/char/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/insert/char/1.cc index a6052e2170b..d284395fa9b 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/insert/char/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/insert/char/1.cc @@ -189,7 +189,7 @@ int test01(void) int main() { - __gnu_cxx_test::set_memory_limits(); + __gnu_test::set_memory_limits(); test01(); return 0; } diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/insert/wchar_t/1.cc b/libstdc++-v3/testsuite/21_strings/basic_string/insert/wchar_t/1.cc index 96f71b0839e..d35e2827b58 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/insert/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/insert/wchar_t/1.cc @@ -189,7 +189,7 @@ int test01(void) int main() { - __gnu_cxx_test::set_memory_limits(); + __gnu_test::set_memory_limits(); test01(); return 0; } diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc index d7e72d67f3a..1a933f8fd3b 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc @@ -33,7 +33,7 @@ void test02() bool test = true; typedef codecvt w_codecvt; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc index ad45e621434..9e98f53f88b 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc @@ -33,7 +33,7 @@ void test03() bool test = true; typedef codecvt w_codecvt; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc index fe72e341a53..0929676270f 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc @@ -33,7 +33,7 @@ void test04() bool test = true; typedef codecvt w_codecvt; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc index c3eca4aeaa5..c103b2e41c5 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc @@ -33,7 +33,7 @@ void test02() typedef codecvt w_codecvt; bool test = true; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc index 8297c260d69..9cc921c7bce 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc @@ -33,7 +33,7 @@ void test03() typedef codecvt w_codecvt; bool test = true; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc index 2ffc351c873..68972e7ab32 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc @@ -33,7 +33,7 @@ void test04() typedef codecvt w_codecvt; bool test = true; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc index a7a622f16a1..51739b6ae3b 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc @@ -88,7 +88,7 @@ void test02() wmemset(i_ref, 0xdeadbeef, size + 1); int_type* ito_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc index 1279d3be1a3..118462d618b 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc @@ -102,7 +102,7 @@ void test03() wmemset(i_ref, 0xdeadbeef, size + 1); int_type* ito_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc index a4ef7fe01c2..c08ee55efea 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc @@ -110,7 +110,7 @@ void test04() wmemset(i_ref, 0xdeadbeef, esize + 1); int_type* ito_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/7.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/7.cc index 799414bbbe5..7d14ab4cfb5 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/7.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/7.cc @@ -60,7 +60,7 @@ void test07() wmemset(i_ref, 0xdeadbeef, size + 1); int_type* ito_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/8.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/8.cc index 27a59c6aa53..296f2eb3171 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/8.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/8.cc @@ -109,7 +109,7 @@ void test08() wmemset(i_ref, 0xdeadbeef, esize + 1); int_type* ito_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/9.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/9.cc index f95a43626ef..7ba367b1327 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/9.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/9.cc @@ -111,7 +111,7 @@ void test09() int_type* ito = i_arr; int_type* ito_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc index 029e30f8fef..6f92b6ce093 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc @@ -61,7 +61,7 @@ void test02() "\xff"; int size = strlen(e_lit); - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc index 41555def81e..8aec29d580b 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc @@ -61,7 +61,7 @@ void test03() "\xff"; int size = strlen(e_lit); - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/4.cc index f49e47dad87..0b7b87c2643 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/4.cc @@ -100,7 +100,7 @@ void test04() int esize = strlen(e_lit); int isize = wcslen(i_lit); - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/7.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/7.cc index 485bfe0278c..7d8ff4a1d80 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/7.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/7.cc @@ -52,7 +52,7 @@ void test07() const ext_type* efrom_next; int size = strlen(e_lit); - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc index efa390b42d8..c99c823fbe2 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc @@ -31,7 +31,7 @@ void test02() bool test = true; typedef codecvt w_codecvt; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc index 50877849d2d..27f67a4f117 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc @@ -31,7 +31,7 @@ void test03() bool test = true; typedef codecvt w_codecvt; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc index 2e2a62e6e32..8ab6828ddb5 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc @@ -31,7 +31,7 @@ void test04() bool test = true; typedef codecvt w_codecvt; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc index bb172dbe351..ff413d5ac8a 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc @@ -86,7 +86,7 @@ void test02() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc index 8d396f87863..b1fa9fa4f22 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc @@ -100,7 +100,7 @@ void test03() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/4.cc index 1a28aa74cd3..4fd193e3055 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/4.cc @@ -107,7 +107,7 @@ void test04() memset(e_ref, 0xf0, esize + 1); ext_type* eto_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc index 7b5c120b7f2..3c069c8bb84 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc @@ -58,7 +58,7 @@ void test03() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc index 5bd81df7a36..a6d107cacb6 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc @@ -71,7 +71,7 @@ void test02() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc index 167e12375a8..7ca700764c3 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc @@ -85,7 +85,7 @@ void test03() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-15"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc index 631b87399bb..234a4b63f46 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc @@ -80,7 +80,7 @@ void test04() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8"); + locale loc = __gnu_test::try_named_locale("en_US.UTF-8"); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc index fd4c90dadff..42469aea514 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc index 892bac54534..b6f944949a3 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc @@ -33,9 +33,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc index e604b202b6f..6712832294c 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc @@ -33,7 +33,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); // cache the collate facets diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc index b74157b84e3..c1825e2bbf2 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc index 56a4083f6ee..8d813abde3d 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc @@ -37,9 +37,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/3.cc index 824f8e1dfa6..c4b87bad068 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/3.cc @@ -33,7 +33,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); // cache the collate facets diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc index 1a36ca2d744..50c697d0f14 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc index 0a5f060e621..8dc885ac533 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc index 5e8336885b5..6ef1bedbb08 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc @@ -33,9 +33,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc index 44c0eb77eb3..2347e0469b2 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc @@ -36,9 +36,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc index 1a36ca2d744..50c697d0f14 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc index 0a5f060e621..8dc885ac533 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc index 4a38327d5eb..679a4b0c8fd 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc @@ -32,9 +32,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc index 21b90ff0e15..c82d97cfa85 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc @@ -32,7 +32,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); // cache the collate facets diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_env.cc index 9f9d1aade91..ca0da1c2f2a 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test02); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc index 2ef10fd5765..1231025372b 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test02); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc index b0a68cf2c6e..4943ba0b7d5 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc @@ -36,9 +36,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/3.cc index 0a3f98113f9..583d747145a 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/3.cc @@ -32,7 +32,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); // cache the collate facets diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc index fb4923958c8..fe7ed8dbfac 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test02); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc index 11327b39582..fdbf3035a78 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test02); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/collate_byname/1.cc b/libstdc++-v3/testsuite/22_locale/collate_byname/1.cc index eec1513af27..f650be796a0 100644 --- a/libstdc++-v3/testsuite/22_locale/collate_byname/1.cc +++ b/libstdc++-v3/testsuite/22_locale/collate_byname/1.cc @@ -32,7 +32,7 @@ void test01() string str; locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); str = loc_de.name(); locale loc_byname(locale::classic(), new collate_byname("de_DE")); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc index 605e5f3dfdb..89be53dd3f0 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc @@ -67,7 +67,7 @@ void test02() } // "de_DE" - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); const ctype& ctype_de = use_facet >(loc_de); for (int i = 0; i < max; ++i) { diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc index 7ff278c1f87..c9eb1e0b2a4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc @@ -67,7 +67,7 @@ void test02() } // "de_DE" - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); const ctype& ctype_de = use_facet >(loc_de); for (int i = 0; i < max; ++i) { diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc index 67d9b6ee153..ac3b436f590 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc @@ -38,7 +38,7 @@ void test03() using namespace std; bool test = true; - locale loc = __gnu_cxx_test::try_named_locale("se_NO.UTF-8"); + locale loc = __gnu_test::try_named_locale("se_NO.UTF-8"); const ctype& wct = use_facet >(loc); const wchar_t* wstrlit = L"\x80"; diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc index e1ab3f76bbe..6f9dec45d3c 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc @@ -38,7 +38,7 @@ void test02() using namespace std; bool test = true; - locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1"); + locale loc = __gnu_test::try_named_locale("en_US.ISO-8859-1"); const ctype& wct = use_facet >(loc); char c = 0xff; diff --git a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc index 1d380d49fdb..d9b32b0a6cb 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc @@ -38,7 +38,7 @@ void test03() using namespace std; bool test = true; - locale loc = __gnu_cxx_test::try_named_locale("se_NO.UTF-8"); + locale loc = __gnu_test::try_named_locale("se_NO.UTF-8"); const ctype& wct = use_facet >(loc); const char* strlit = "\xc2\x80"; diff --git a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/facet/2.cc b/libstdc++-v3/testsuite/22_locale/facet/2.cc index 379ed8975f0..844eb7b3d24 100644 --- a/libstdc++-v3/testsuite/22_locale/facet/2.cc +++ b/libstdc++-v3/testsuite/22_locale/facet/2.cc @@ -83,7 +83,7 @@ void test02() // 4: Named locale should destroy facets when it goes out of scope. // Not quite sure how to test for this w/o valgrind at the moment. { - locale loc03 = __gnu_cxx_test::try_named_locale("es_MX"); + locale loc03 = __gnu_test::try_named_locale("es_MX"); } } diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc index 15ea686141e..e49756f18fd 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc @@ -170,7 +170,7 @@ void test01() // 3 // explicit locale(const char* std_name) - locale loc06 = __gnu_cxx_test::try_named_locale("fr_FR"); + locale loc06 = __gnu_test::try_named_locale("fr_FR"); VERIFY (loc06 != loc01); VERIFY (loc06 != loc02); VERIFY (loc06.name() == "fr_FR"); diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc index f6fc08adaf3..e450441816e 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc @@ -33,7 +33,7 @@ void test03() const char* LC_ALL_orig = getenv("LC_ALL"); if (!setenv("LC_ALL", "it_IT", 1)) { - std::locale loc = __gnu_cxx_test::try_named_locale(""); + std::locale loc = __gnu_test::try_named_locale(""); VERIFY( loc.name() == "it_IT" ); setenv("LC_ALL", LC_ALL_orig ? LC_ALL_orig : "", 1); } diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc index c24f6a42a79..5492a0ce723 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/5.cc @@ -65,7 +65,7 @@ void test04() // Check that a "POSIX" LC_ALL is equivalent to "C". if (!setenv("LC_ALL", "POSIX", 1)) { - locale loc = __gnu_cxx_test::try_named_locale(""); + locale loc = __gnu_test::try_named_locale(""); VERIFY( loc.name() == "C" ); } setenv("LC_ALL", "", 1); @@ -73,7 +73,7 @@ void test04() // Check that a "en_PH" LC_ALL is equivalent to "en_PH". if (!setenv("LC_ALL", "en_PH", 1)) { - locale loc = __gnu_cxx_test::try_named_locale(""); + locale loc = __gnu_test::try_named_locale(""); VERIFY( loc.name() == "en_PH" ); } setenv("LC_ALL", "", 1); @@ -83,7 +83,7 @@ void test04() { if (!setenv("LC_ALL", "en_PH", 1)) { - locale loc = __gnu_cxx_test::try_named_locale(""); + locale loc = __gnu_test::try_named_locale(""); VERIFY( loc.name() == "en_PH" ); } setenv("LC_ALL", "", 1); @@ -112,7 +112,7 @@ void test04() // Check the default set by LANG. if (!setenv("LANG", "fr_FR", 1)) { - locale loc = __gnu_cxx_test::try_named_locale(""); + locale loc = __gnu_test::try_named_locale(""); VERIFY( loc.name() == "fr_FR" ); } @@ -126,7 +126,7 @@ void test04() // Setting a category in the "C" default. if (!setenv("LC_COLLATE", "de_DE", 1)) { - locale loc = __gnu_cxx_test::try_named_locale(""); + locale loc = __gnu_test::try_named_locale(""); #if _GLIBCXX_NUM_CATEGORIES VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;" @@ -142,7 +142,7 @@ void test04() // Changing the LANG default while LC_COLLATE is set. if (!setenv("LANG", "fr_FR", 1)) { - locale loc = __gnu_cxx_test::try_named_locale(""); + locale loc = __gnu_test::try_named_locale(""); #if _GLIBCXX_NUM_CATEGORIES VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;" "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;" @@ -160,7 +160,7 @@ void test04() #if _GLIBCXX_NUM_CATEGORIES if (!setenv("LC_IDENTIFICATION", "it_IT", 1)) { - locale loc = __gnu_cxx_test::try_named_locale(""); + locale loc = __gnu_test::try_named_locale(""); VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;" "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;" "LC_MESSAGES=fr_FR;LC_PAPER=fr_FR;LC_NAME=fr_FR;" diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc index ced0f59f6be..ffcd3ab943a 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc @@ -35,7 +35,7 @@ test02() // construct a locale object with the specialized facet. locale loc_c = locale::classic(); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); locale loc_1(locale::classic(), new numpunct_byname("fr_FR")); diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc index 126db7da1fa..8bd9c4ace2a 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc @@ -30,8 +30,8 @@ void test02() { bool test = true; - std::locale loc_1 = __gnu_cxx_test::try_named_locale(""); - std::locale loc_2 = __gnu_cxx_test::try_named_locale(""); + std::locale loc_1 = __gnu_test::try_named_locale(""); + std::locale loc_2 = __gnu_test::try_named_locale(""); VERIFY( loc_1 == loc_2 ); } diff --git a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc index 7d5aec00771..81b06ee0ecd 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc @@ -42,13 +42,13 @@ void test02() // named locales work. if (testph && testmx) { - const locale loc_ph = __gnu_cxx_test::try_named_locale(ph.c_str()); - const locale loc_mx = __gnu_cxx_test::try_named_locale(mx.c_str()); + const locale loc_ph = __gnu_test::try_named_locale(ph.c_str()); + const locale loc_mx = __gnu_test::try_named_locale(mx.c_str()); // Use setlocale between two calls to locale("") - const locale loc_env_1 = __gnu_cxx_test::try_named_locale(""); + const locale loc_env_1 = __gnu_test::try_named_locale(""); setlocale(LC_ALL, ph.c_str()); - const locale loc_env_2 = __gnu_cxx_test::try_named_locale(""); + const locale loc_env_2 = __gnu_test::try_named_locale(""); VERIFY( loc_env_1 == loc_env_2 ); // Change global locale. diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc index 2956ec8ab9e..8201be5bcd6 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc @@ -35,9 +35,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc index eed7efaa262..927a55046f6 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc @@ -35,9 +35,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc index ad975115720..134294958e3 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc @@ -35,9 +35,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/messages_byname/1.cc b/libstdc++-v3/testsuite/22_locale/messages_byname/1.cc index e915c9675cb..a3232dd4c95 100644 --- a/libstdc++-v3/testsuite/22_locale/messages_byname/1.cc +++ b/libstdc++-v3/testsuite/22_locale/messages_byname/1.cc @@ -35,7 +35,7 @@ void test01() const char* dir = LOCALEDIR; locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); str = loc_de.name(); locale loc_byname(locale::classic(), new messages_byname("de_DE")); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc index b35b448db2f..ed0d19e46ec 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc @@ -36,9 +36,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/11528.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/11528.cc index a3eb48ba95a..c4f00f7add9 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/11528.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/11528.cc @@ -29,7 +29,7 @@ void test01() bool test = true; - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); + locale loc_us = __gnu_test::try_named_locale("en_US"); iterator_type end; istringstream iss; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc index a0d4caef7a2..ddb2c3f5d6f 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc @@ -36,9 +36,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc index 80e47c940fd..91ca66fb64c 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc @@ -36,9 +36,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc index b62e2f44764..d3c8359b528 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc @@ -36,9 +36,9 @@ void test04() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc index b9872d9c7b0..97db30aba24 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_env.cc @@ -56,7 +56,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc index 996af345b58..ec63ba9b24b 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc @@ -56,7 +56,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc index 8d1d532c9a1..a3965f79a6a 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc @@ -36,9 +36,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11528.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11528.cc index 20b33ade763..5c0036162fc 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11528.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11528.cc @@ -29,7 +29,7 @@ void test01() bool test = true; - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); + locale loc_us = __gnu_test::try_named_locale("en_US"); iterator_type end; wistringstream iss; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc index 38721ce9991..a3959df3218 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc @@ -36,9 +36,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc index da33d636035..2883e7a4d43 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc @@ -36,9 +36,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc index 91b05cb45e4..94c27aa7cf9 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc @@ -36,9 +36,9 @@ void test04() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc index b9872d9c7b0..97db30aba24 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc @@ -56,7 +56,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc index 996af345b58..ec63ba9b24b 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc @@ -56,7 +56,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc index 27d79dc4b07..12192f5bcab 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc @@ -36,9 +36,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc index 69cfeb6ca55..044ea1174bc 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc @@ -36,9 +36,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc index 49531ad0a38..ead1aff1b72 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc @@ -36,9 +36,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc index c04f700e5cd..2f7385fb155 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc @@ -48,7 +48,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc index 88f84572a91..105db813293 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc @@ -48,7 +48,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc index 19c04d68007..942589bb540 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc @@ -36,9 +36,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc index ad5834b1921..2f32240bd3f 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc @@ -36,9 +36,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc index 03c747ac842..de5f5db79d6 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc @@ -36,9 +36,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE@euro"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc index c04f700e5cd..2f7385fb155 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc @@ -48,7 +48,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc index 88f84572a91..105db813293 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc @@ -48,7 +48,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc index 13d680e14fb..833995ba35a 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc @@ -34,7 +34,7 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/2.cc index 4394d83257a..d3bbc39da18 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/2.cc @@ -34,7 +34,7 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); // cache the moneypunct facets typedef moneypunct __money_true; diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct_byname/1.cc b/libstdc++-v3/testsuite/22_locale/moneypunct_byname/1.cc index 70cbf38058d..ea0857a5736 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct_byname/1.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct_byname/1.cc @@ -32,7 +32,7 @@ void test01() bool test = true; string str; - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); str = loc_de.name(); locale loc_byname(locale::classic(), new moneypunct_byname("de_DE")); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc index 6d4de201f24..190f9921aef 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/2.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/2.cc index cb446c7e36a..8d0ce69e254 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/2.cc @@ -33,9 +33,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc index 41867ca9192..43e16c2d2c4 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc @@ -33,9 +33,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/5.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/5.cc index 0590d49b13e..e170931d060 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/5.cc @@ -36,7 +36,7 @@ void test05() istringstream iss; // A locale that expects grouping - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); iss.imbue(loc_de); const num_get& ng = use_facet >(iss.getloc()); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/6.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/6.cc index a6b94172035..52722d1acb8 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/6.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/6.cc @@ -33,7 +33,7 @@ void test06() double d = 0.0; istringstream iss; - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); iss.imbue(loc_de); const num_get& ng = use_facet >(iss.getloc()); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc index c04f700e5cd..2f7385fb155 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_env.cc @@ -48,7 +48,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc index 88f84572a91..105db813293 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc @@ -48,7 +48,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc index 784f83cb6fd..952651d883c 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/2.cc index bbf2a98872a..6f52860f3bf 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/2.cc @@ -33,9 +33,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc index 65fcf84051a..3a775682a2b 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc @@ -33,9 +33,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc index 8443816a8d6..09f12be587b 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc @@ -36,7 +36,7 @@ void test05() wistringstream iss; // A locale that expects grouping - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); iss.imbue(loc_de); const num_get& ng = use_facet >(iss.getloc()); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc index 57490f3f0aa..e2aeb184b23 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc @@ -33,7 +33,7 @@ void test06() double d = 0.0; wistringstream iss; - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); iss.imbue(loc_de); const num_get& ng = use_facet >(iss.getloc()); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc index c04f700e5cd..2f7385fb155 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc @@ -48,7 +48,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc index 88f84572a91..105db813293 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc @@ -48,7 +48,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc index bffab3fefe6..cc1759129c6 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/2.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/2.cc index 407dbff3a65..5f783320c5f 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/2.cc @@ -33,9 +33,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc index 080a2a47672..cae87474f29 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc @@ -33,9 +33,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/5.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/5.cc index 055f4c9f316..ce590ea57e8 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/5.cc @@ -33,7 +33,7 @@ void test05() bool test = true; // A locale that expects grouping. - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); const string empty; string result; diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc index 2baa3a44950..0bcd332b1de 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_env.cc @@ -44,7 +44,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc index 63e7a470160..ab9a6a65927 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc @@ -44,7 +44,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc index a8a5da15e0f..379a1379d51 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/2.cc index 8416c4c16c9..30faf63f649 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/2.cc @@ -33,9 +33,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc index 26750ac7a61..5115355969f 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc @@ -33,9 +33,9 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/5.cc index dd4799b85bd..ea9e39f231b 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/5.cc @@ -33,7 +33,7 @@ void test05() bool test = true; // A locale that expects grouping. - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); const wstring empty; wstring result; diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc index 2baa3a44950..0bcd332b1de 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc @@ -44,7 +44,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc index 63e7a470160..ab9a6a65927 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc @@ -44,7 +44,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/1.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/1.cc index 023c64f8d7c..b57ecb21fac 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/1.cc @@ -31,9 +31,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc index b6c8b2ddecc..0ff21db6dce 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc @@ -31,9 +31,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/1.cc index e3426fda43c..ef1c9f0af7d 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/1.cc @@ -31,9 +31,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc index 9b55ae95e33..fce8fa2c6d7 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc @@ -31,9 +31,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = __gnu_cxx_test::try_named_locale("en_US"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_us = __gnu_test::try_named_locale("en_US"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc index 4f1d5e3f6a9..19e4210ff2c 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc index 8d7871815db..292b8c738e4 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct_byname/1.cc b/libstdc++-v3/testsuite/22_locale/numpunct_byname/1.cc index 96a9691ac6d..a3fcaf268f4 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct_byname/1.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct_byname/1.cc @@ -30,7 +30,7 @@ void test01() bool test = true; string str; - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); str = loc_de.name(); locale loc_byname(locale::classic(), new numpunct_byname("de_DE")); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct_byname/2.cc b/libstdc++-v3/testsuite/22_locale/numpunct_byname/2.cc index 6bebbbf0d4c..4e6c9d68e62 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct_byname/2.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct_byname/2.cc @@ -29,7 +29,7 @@ void test02() bool test = true; - locale loc_it = __gnu_cxx_test::try_named_locale("it_IT"); + locale loc_it = __gnu_test::try_named_locale("it_IT"); const numpunct& nump_it = use_facet >(loc_it); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/1.cc index 59128a61336..f4f0b88502c 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/1.cc index b4a2fcf6984..c9c19dfc29a 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc index b3d040edc7a..c6356dfa6c4 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_env("de_DE", "LANG", two); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc index 17d4d5dcb82..3be97fb4ee7 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc @@ -28,7 +28,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); run_tests_wrapped_locale("ja_JP.eucjp", two); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/1.cc index a4782795f6e..7c54955a76e 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/1.cc @@ -34,9 +34,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc index 149b95276d5..63d2602272a 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/2.cc @@ -34,9 +34,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/1.cc index 71a30d11b87..aedf8817d8c 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/1.cc @@ -34,9 +34,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc index 33312396dac..aff0d1e74e7 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/2.cc @@ -34,9 +34,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/1.cc index 6ecbb0a0ddb..17f52a56385 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/1.cc @@ -37,9 +37,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc index 6535a66c4e9..f9d79a43440 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc @@ -34,9 +34,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc index 7e82e5197c2..0b86d74f996 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc @@ -37,9 +37,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc index edab4ba3f3c..63689eefca3 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc @@ -34,9 +34,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc index 89015346acf..1517fe2e138 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc index ddb817f0913..9b307d7535c 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/2.cc @@ -33,9 +33,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc index a1fe3b3d2e7..00ee21e680a 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc @@ -33,9 +33,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc index 0151fc64d33..a412cf01011 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/2.cc @@ -33,9 +33,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/1.cc index c530170d05a..ecbe8ecc2d8 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/1.cc @@ -34,9 +34,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc index 68a7d89ed1a..e423be62572 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc @@ -34,9 +34,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc index 0c7d5b40f04..dca85d24fd2 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc @@ -34,9 +34,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc index af2e3ecc6ec..1ca267440e7 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc @@ -34,9 +34,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc index 3f042d9ec42..294934099c1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc index 61086ad6da8..e54f823b8f9 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc @@ -36,7 +36,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc index 0f408fc1f12..d0aea858ae7 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/1.cc @@ -34,9 +34,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc index 206130ac140..bcc3e36e2d6 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test03); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc index b805c3c43cf..3cfb7053f17 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test03); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc index e5c726a13b3..f8158957272 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/1.cc @@ -34,9 +34,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc index 206130ac140..bcc3e36e2d6 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test03); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc index b805c3c43cf..3cfb7053f17 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc @@ -32,7 +32,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test03); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc index d3acb9b824a..b547034f7a0 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/1.cc @@ -40,9 +40,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc index 4656efc16e4..eb844f16209 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/2.cc @@ -40,9 +40,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc index 3b768db4b12..522a899ef38 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/3.cc @@ -40,9 +40,9 @@ void test03() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc index d07fad6dc2d..8c9b1e0f492 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/4.cc @@ -40,9 +40,9 @@ void test04() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc index e1355b8ea47..9376987050e 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/5.cc @@ -41,9 +41,9 @@ void test05() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc index 5634d9f3bde..e0ea595f08d 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/6.cc @@ -41,9 +41,9 @@ void test06() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc index 91a5e9bf848..1f37a24a16f 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/7.cc @@ -42,9 +42,9 @@ void test07() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc index 7409ff9cbb4..b047ed96547 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/8.cc @@ -41,9 +41,9 @@ void test08() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc index bcf68e986ba..c887914ee63 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_env.cc @@ -64,7 +64,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc index 465af45016e..097e11a55bb 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc @@ -64,7 +64,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc index 874b62800c2..c6f36b732f0 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/1.cc @@ -40,9 +40,9 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc index b41e6a7feb5..67ce4a344d1 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/2.cc @@ -40,9 +40,9 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc index d3cf9dd9971..c0ecf6acef3 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/3.cc @@ -40,9 +40,9 @@ void test03() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc index db04bcc0765..6206ff57734 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/4.cc @@ -40,9 +40,9 @@ void test04() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc index 9268127b1a5..b017d420549 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/5.cc @@ -41,9 +41,9 @@ void test05() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc index 90f7614f9d9..8bb5b237d66 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/6.cc @@ -41,9 +41,9 @@ void test06() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc index c63147870df..354285e35ca 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/7.cc @@ -41,9 +41,9 @@ void test07() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc index a7edf18c477..6367a8edd27 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/8.cc @@ -41,9 +41,9 @@ void test08() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK"); - locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro"); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_hk = __gnu_test::try_named_locale("en_HK"); + locale loc_fr = __gnu_test::try_named_locale("fr_FR@euro"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc index bcf68e986ba..c887914ee63 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc @@ -64,7 +64,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc index 465af45016e..097e11a55bb 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc @@ -64,7 +64,7 @@ int main() { - using namespace __gnu_cxx_test; + using namespace __gnu_test; func_callback two; two.push_back(&test01); two.push_back(&test02); diff --git a/libstdc++-v3/testsuite/23_containers/deque_ctor.cc b/libstdc++-v3/testsuite/23_containers/deque_ctor.cc index 50a813368bb..cb20e56fbc2 100644 --- a/libstdc++-v3/testsuite/23_containers/deque_ctor.cc +++ b/libstdc++-v3/testsuite/23_containers/deque_ctor.cc @@ -26,13 +26,13 @@ #include #include -using __gnu_cxx_test::copy_tracker; -using __gnu_cxx_test::allocation_tracker; -using __gnu_cxx_test::tracker_alloc; -using __gnu_cxx_test::copy_constructor; -using __gnu_cxx_test::assignment_operator; -using __gnu_cxx_test::counter; -using __gnu_cxx_test::destructor; +using __gnu_test::copy_tracker; +using __gnu_test::allocation_tracker; +using __gnu_test::tracker_alloc; +using __gnu_test::copy_constructor; +using __gnu_test::assignment_operator; +using __gnu_test::counter; +using __gnu_test::destructor; typedef std::deque gdeque; diff --git a/libstdc++-v3/testsuite/23_containers/list_modifiers.cc b/libstdc++-v3/testsuite/23_containers/list_modifiers.cc index 8cdc9f0e254..3e9fa498b84 100644 --- a/libstdc++-v3/testsuite/23_containers/list_modifiers.cc +++ b/libstdc++-v3/testsuite/23_containers/list_modifiers.cc @@ -21,7 +21,7 @@ #include #include -typedef __gnu_cxx_test::copy_tracker T; +typedef __gnu_test::copy_tracker T; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/vector_capacity.cc b/libstdc++-v3/testsuite/23_containers/vector_capacity.cc index b6e347de309..526e37e7635 100644 --- a/libstdc++-v3/testsuite/23_containers/vector_capacity.cc +++ b/libstdc++-v3/testsuite/23_containers/vector_capacity.cc @@ -26,12 +26,12 @@ #include #include -using __gnu_cxx_test::copy_tracker; -using __gnu_cxx_test::allocation_tracker; -using __gnu_cxx_test::tracker_alloc; -using __gnu_cxx_test::copy_constructor; -using __gnu_cxx_test::assignment_operator; -using __gnu_cxx_test::destructor; +using __gnu_test::copy_tracker; +using __gnu_test::allocation_tracker; +using __gnu_test::tracker_alloc; +using __gnu_test::copy_constructor; +using __gnu_test::assignment_operator; +using __gnu_test::destructor; template struct A { }; diff --git a/libstdc++-v3/testsuite/23_containers/vector_ctor.cc b/libstdc++-v3/testsuite/23_containers/vector_ctor.cc index 8b93207606e..854c6a680fa 100644 --- a/libstdc++-v3/testsuite/23_containers/vector_ctor.cc +++ b/libstdc++-v3/testsuite/23_containers/vector_ctor.cc @@ -25,11 +25,11 @@ #include #include -using __gnu_cxx_test::copy_tracker; -using __gnu_cxx_test::allocation_tracker; -using __gnu_cxx_test::tracker_alloc; -using __gnu_cxx_test::copy_constructor; -using __gnu_cxx_test::assignment_operator; +using __gnu_test::copy_tracker; +using __gnu_test::allocation_tracker; +using __gnu_test::tracker_alloc; +using __gnu_test::copy_constructor; +using __gnu_test::assignment_operator; template struct A { }; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/2.cc index af92af0ff11..5005c17f4b4 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/2.cc @@ -33,7 +33,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class basic_filebuf >; template class basic_filebuf >; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc index de6e1339a0e..434f1e2312d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc @@ -42,7 +42,7 @@ void test02() VERIFY( p != bad); // 1 "if file is not positioned at its beginning" fails... - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc ); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc index 5a43a2a4a2f..efe8cbbeea0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc @@ -34,10 +34,10 @@ void test07() std::filebuf ob; VERIFY( ob.getloc() == loc ); - locale::global(__gnu_cxx_test::try_named_locale("en_US")); + locale::global(__gnu_test::try_named_locale("en_US")); VERIFY( ob.getloc() == loc ); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc_de ); VERIFY( ret == loc ); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc index 4acff8123e7..7fe0d4cc65b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc @@ -42,7 +42,7 @@ void test02() VERIFY( p != bad); // 1 "if file is not positioned at its beginning" fails... - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc ); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc index 1b083fd023a..8a76a997c9a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc @@ -34,10 +34,10 @@ void test07() std::wfilebuf ob; VERIFY( ob.getloc() == loc ); - locale::global(__gnu_cxx_test::try_named_locale("en_US")); + locale::global(__gnu_test::try_named_locale("en_US")); VERIFY( ob.getloc() == loc ); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc_de ); VERIFY( ret == loc ); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc index 185fb1ed658..fc96a047fdf 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc @@ -28,7 +28,7 @@ void test01() bool test = true; wfilebuf fb; - locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); + locale loc(__gnu_test::try_named_locale("en_US.UTF-8")); fb.pubimbue(loc); fb.pubsetbuf(0, 0); fb.open("tmp_11305-1", ios_base::out); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc index f50f59218cd..2415a2edcfb 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc @@ -28,7 +28,7 @@ void test02() bool test = true; wfilebuf fb; - locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); + locale loc(__gnu_test::try_named_locale("en_US.UTF-8")); fb.pubimbue(loc); fb.pubsetbuf(0, 0); fb.open("tmp_11305-2", ios_base::out); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc index 86153ea1ff0..fc0092df09c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc @@ -28,7 +28,7 @@ void test03() bool test = true; wfilebuf fb; - locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); + locale loc(__gnu_test::try_named_locale("en_US.UTF-8")); fb.pubimbue(loc); fb.open("tmp_11305-3", ios_base::out); wfilebuf::int_type n1 = fb.sputc(L'a'); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc index b923a8a9e70..1886f8e630f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc @@ -28,7 +28,7 @@ void test04() bool test = true; wfilebuf fb; - locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); + locale loc(__gnu_test::try_named_locale("en_US.UTF-8")); fb.pubimbue(loc); fb.open("tmp_11405-4", ios_base::out); wfilebuf::int_type n1 = fb.sputc(L'i'); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc index e03da5f2064..f1b30d8de1a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "sgetc.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc index 451518c1f23..f649ef87dc6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc @@ -33,7 +33,7 @@ const char name_03[] = "tmp_sbumpc_1io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc index 69559a9a69c..1a43f327dca 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-out.cc @@ -32,7 +32,7 @@ const char name_02[] = "tmp_sbumpc_1out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc index d0f256ee10c..e06e0625efb 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "sgetc.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc index ef1f28f786e..54a3047ad00 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc @@ -33,7 +33,7 @@ const char name_03[] = "tmp_sbumpc_2io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc index 1d8df086bcc..a650e8eab96 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-out.cc @@ -32,7 +32,7 @@ const char name_02[] = "tmp_sbumpc_2out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc index 62173d0c843..2da27f13dcd 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekoff.txt"; void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc index 00872f4117d..a655fd81ab7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekoff-1io.tst"; void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc index 39abdac89d3..40c62aafe25 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekoff-1out.tst"; void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc index 0dc97ded28a..a1adf32b8be 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekoff.txt"; void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc index 8be6f5e7adf..fd30a33007d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekoff-2io.tst"; void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc index 4a39a2164f3..786fb245a16 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekoff-2out.tst"; void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc index 9464eefc1d3..3230e121ed2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekpos.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc index 009886032aa..ecaa19fb2d8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekpos-1io.tst"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc index b0008f3cb43..e3c9ac3f3f3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekpos-1out.tst"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc index ec1dca5abb8..2fde41aed9e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekpos.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc index f883cf9ef3a..71fb68bf3ff 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekpos-2io.tst"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc index 9531e01c609..ee8c65f5154 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc @@ -32,7 +32,7 @@ const char name_01[] = "seekpos-2out.tst"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::pos_type pos_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc index 7ae7cdccee4..2a1012d812e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc @@ -33,7 +33,7 @@ const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc index 7a754768002..ca92295456e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc @@ -34,7 +34,7 @@ const char name_03[] = "tmp_sgetc_1io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc index 41e18e435e4..cdd9bf47051 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-out.cc @@ -33,7 +33,7 @@ const char name_02[] = "tmp_sgetc_1out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc index 979a3fd3845..3c539de1840 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc @@ -33,7 +33,7 @@ const char name_01[] = "sgetc.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc index e12ef3455cd..09b6e8a7f0a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc @@ -34,7 +34,7 @@ const char name_03[] = "tmp_sgetc_2io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc index 491c028c281..1db40febda2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-out.cc @@ -33,7 +33,7 @@ const char name_02[] = "tmp_sgetc_2out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc index 0f17624c58c..523bdeac34b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc @@ -33,7 +33,7 @@ const char name_01[] = "sgetn.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc index e1d9a38f75e..9942a822b26 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc @@ -34,7 +34,7 @@ const char name_03[] = "tmp_sgetn_1io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc index eb710f2d056..1039c397303 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc @@ -33,7 +33,7 @@ const char name_02[] = "tmp_sgetn_1out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc index 62c5a0f93f0..451e6dcfee3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc @@ -33,7 +33,7 @@ const char name_01[] = "sgetn.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc index 30ccee29f2e..a3fd754e36d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc @@ -34,7 +34,7 @@ const char name_03[] = "tmp_sgetn_2io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc index 99a907493d4..c0e6be07443 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc @@ -33,7 +33,7 @@ const char name_02[] = "tmp_sgetn_2out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc index 437a7fb6535..d2d9d3b1c55 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc @@ -34,7 +34,7 @@ const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc index aa5000d987a..973d89b41f3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc @@ -34,7 +34,7 @@ const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc index 118383a978e..fd7124a1448 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc @@ -34,7 +34,7 @@ const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc index 8c563ad41e8..fc89dd5e644 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "sgetc.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc index a044c6d4f41..8c2c0e868e5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc @@ -33,7 +33,7 @@ const char name_03[] = "tmp_snextc_2io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc index 8af126337f6..816c3f85406 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-out.cc @@ -32,7 +32,7 @@ const char name_02[] = "tmp_snextc_2out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc index bd6e2055eff..1d216e8ec20 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc @@ -33,7 +33,7 @@ const char name_01[] = "sgetc.txt"; // file with data in it void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc index f43191cc730..d867e5b87a2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-io.cc @@ -32,7 +32,7 @@ const char name_01[] = "tmp_sputbackc_1io.tst"; // empty file, need to create void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc index 83d57e2fc61..5b5dbb557c1 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-out.cc @@ -33,7 +33,7 @@ const char name_01[] = "tmp_sputbackc_1out.tst"; // empty file, need to create void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc index 5deafbc7da7..a9267cf0034 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc @@ -33,7 +33,7 @@ const char name_01[] = "sgetc.txt"; // file with data in it void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc index 093c663db3a..e7166106d59 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-io.cc @@ -32,7 +32,7 @@ const char name_01[] = "tmp_sputbackc_2io.tst"; // empty file, need to create void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc index 52f041d8af9..2ff9a6c5aad 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-out.cc @@ -33,7 +33,7 @@ const char name_01[] = "tmp_sputbackc_2out.tst"; // empty file, need to create void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc index 25d9ee0ce8d..31b176bcbf6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc index 72350c0a8b8..275def18397 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-io.cc @@ -33,7 +33,7 @@ const char name_03[] = "tmp_sputc_1io.tst"; void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc index f4b5b73f0e7..09086b07d60 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-out.cc @@ -32,7 +32,7 @@ const char name_02[] = "tmp_sputc_1out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc index 85ab4efbeff..680e058a904 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc index 373a6a8cba5..abbdea55fbd 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc @@ -33,7 +33,7 @@ const char name_03[] = "tmp_sputc_2io.tst"; void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc index 96e12954a97..78e2b4eb3d6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-out.cc @@ -32,7 +32,7 @@ const char name_02[] = "tmp_sputc_2out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc index 235fce07e22..4888f23bb16 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc index 9ec3d259ca8..7f32662d315 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc @@ -33,7 +33,7 @@ const char name_03[] = "tmp_sputn_1io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc index f98bcd745b1..d17db7abf3b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-out.cc @@ -32,7 +32,7 @@ const char name_02[] = "tmp_sputn_1out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc index 8972b5efcb8..a9f188cf410 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc @@ -32,7 +32,7 @@ const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc index c6109c2f100..2dc0204c94e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-io.cc @@ -33,7 +33,7 @@ const char name_03[] = "tmp_sputn_2io.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc index 81cd506aba1..26046b17a35 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-out.cc @@ -32,7 +32,7 @@ const char name_02[] = "tmp_sputn_2out.tst"; // empty file, need to create void test05() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc index bf753cabcb6..7e3b9c07621 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc @@ -33,7 +33,7 @@ const char name_01[] = "sgetc.txt"; // file with data in it void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc index 78464834bec..5cbaf1b8db2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc @@ -32,7 +32,7 @@ const char name_01[] = "tmp_sungetc_1io.tst"; // empty file, need to create void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc index 99cf7ed383c..daefb70b997 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-out.cc @@ -33,7 +33,7 @@ const char name_01[] = "tmp_sungetc_1out.tst"; // empty file, need to create void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc index e0814fdddc0..d35a3f2ae8b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc @@ -33,7 +33,7 @@ const char name_01[] = "sgetc.txt"; // file with data in it void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc index 24d015c90e7..b45ba2676bf 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc @@ -32,7 +32,7 @@ const char name_01[] = "tmp_sungetc_2io.tst"; // empty file, need to create void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc index d6cd79f5c6e..f08df15e7b8 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-out.cc @@ -33,7 +33,7 @@ const char name_01[] = "tmp_sungetc_2out.tst"; // empty file, need to create void test01() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; typedef std::filebuf::int_type int_type; typedef filebuf::traits_type traits_type; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc index c4866ef3d97..d0753650d12 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc @@ -34,7 +34,7 @@ void test01() fbout.close(); wfilebuf fbin; - locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); + locale loc(__gnu_test::try_named_locale("en_US.UTF-8")); fbin.pubimbue(loc); fbin.open(name_01, ios_base::in); VERIFY( fbin.sbumpc() == L'a' ); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc index 90dfb8fd1fd..1717f2a5aeb 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc @@ -35,7 +35,7 @@ void test02() fbout.close(); wfilebuf fbin; - locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); + locale loc(__gnu_test::try_named_locale("en_US.UTF-8")); fbin.pubimbue(loc); fbin.open(name_02, ios_base::in); VERIFY( fbin.sbumpc() == L'a' ); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc index c4b48597919..c23cb56f26b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc @@ -34,7 +34,7 @@ void test03() fbout.close(); wfilebuf fbin; - locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); + locale loc(__gnu_test::try_named_locale("en_US.UTF-8")); fbin.pubimbue(loc); fbin.pubsetbuf(0, 0); fbin.open(name_03, ios_base::in); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc index 00d1edc2f05..ec2f0f89245 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc @@ -35,7 +35,7 @@ void test04() fbout.close(); wfilebuf fbin; - locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8")); + locale loc(__gnu_test::try_named_locale("en_US.UTF-8")); fbin.pubimbue(loc); fbin.pubsetbuf(0, 0); fbin.open(name_04, ios_base::in); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc index a764bb2b5de..5bd831378d7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc @@ -35,7 +35,7 @@ void test01() putc(static_cast(i), file); fclose(file); - locale loc (__gnu_cxx_test::try_named_locale("de_DE.ISO-8859-15@euro")); + locale loc (__gnu_test::try_named_locale("de_DE.ISO-8859-15@euro")); wchar_t buf[1]; wfilebuf fb; fb.pubimbue(loc); diff --git a/libstdc++-v3/testsuite/27_io/basic_fstream/2.cc b/libstdc++-v3/testsuite/27_io/basic_fstream/2.cc index 3faf03f4dcf..861a6044f9e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_fstream/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_fstream/2.cc @@ -38,7 +38,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class basic_fstream >; template class basic_fstream >; diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc index 6daa4e02c5e..3286411eb62 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc @@ -43,7 +43,7 @@ void test03() typedef std::ios_base::fmtflags fmtflags; typedef std::ios_base::iostate iostate; locale loc_c = locale::classic(); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); std::ios ios_01(NULL); std::ios ios_02(NULL); ios_01.imbue(loc_c); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/2.cc index 40ec332923d..7676f6a094e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/2.cc @@ -38,7 +38,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class basic_istream >; template class basic_istream >; diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9826.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9826.cc index 9d59395bde4..157084167f5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9826.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/char/9826.cc @@ -39,7 +39,7 @@ void test02() { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; basic_stringstream > sstr; // 1 diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/2.cc index 8c672b1f076..3910aa7bd34 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/2.cc @@ -38,7 +38,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class basic_ostream >; template class basic_ostream >; diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc index 92180927f6f..2cf4021108f 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc @@ -43,7 +43,7 @@ test02() os2.setf(ios::fixed); // Check it can be done in a locale with grouping on. - locale loc2 = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc2 = __gnu_test::try_named_locale("de_DE"); os2.imbue(loc2); os2 << fixed << setprecision(3) << val2 << endl; os2 << endl; diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/2.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/2.cc index b3a48269bf4..71da9a59349 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/2.cc @@ -38,7 +38,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class basic_streambuf >; template class basic_streambuf >; diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc index fee82668f9d..7dbfdc75562 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/9322.cc @@ -53,10 +53,10 @@ void test08() testbuf ob; VERIFY( ob.getloc() == loc ); - locale::global(__gnu_cxx_test::try_named_locale("en_US")); + locale::global(__gnu_test::try_named_locale("en_US")); VERIFY( ob.getloc() == loc ); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc_de ); VERIFY( ret == loc ); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/1.cc index a91deab2f1d..7841f3275c5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/1.cc @@ -50,7 +50,7 @@ void test01() namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class basic_stringbuf >; template class basic_stringbuf >; diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/2.cc index f40868a179f..940aa7a852a 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/2.cc @@ -33,7 +33,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class basic_stringbuf >; template class basic_stringbuf >; diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/4.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/4.cc index cd4c4311c6a..fd2ddbd6acc 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/4.cc @@ -30,8 +30,8 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; - typedef __gnu_cxx_test::tracker_alloc alloc_type; + using __gnu_test::pod_char; + typedef __gnu_test::tracker_alloc alloc_type; template class basic_stringbuf, alloc_type>; } // test diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc index 7006dda094a..549e59ef841 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc @@ -33,10 +33,10 @@ void test03() std::stringbuf ob; VERIFY( ob.getloc() == loc ); - locale::global(__gnu_cxx_test::try_named_locale("en_US")); + locale::global(__gnu_test::try_named_locale("en_US")); VERIFY( ob.getloc() == loc ); - locale loc_de = __gnu_cxx_test::try_named_locale("de_DE"); + locale loc_de = __gnu_test::try_named_locale("de_DE"); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc_de ); VERIFY( ret == loc ); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/2.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/2.cc index abadf8271e6..5cd55f1d30b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringstream/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/2.cc @@ -38,7 +38,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class basic_stringstream >; template class basic_stringstream >; diff --git a/libstdc++-v3/testsuite/27_io/fpos/1.cc b/libstdc++-v3/testsuite/27_io/fpos/1.cc index 5d074c1e270..8d927dc51e1 100644 --- a/libstdc++-v3/testsuite/27_io/fpos/1.cc +++ b/libstdc++-v3/testsuite/27_io/fpos/1.cc @@ -28,7 +28,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class fpos; template class fpos; diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc index dac74cd35da..ee27d44788c 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/1.cc @@ -48,7 +48,7 @@ void test01() int main(void) { - __gnu_cxx_test::set_memory_limits(); + __gnu_test::set_memory_limits(); test01(); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc index 751b6be2583..7df7eb965b4 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/2.cc @@ -123,7 +123,7 @@ void test02() int main(void) { - __gnu_cxx_test::set_memory_limits(); + __gnu_test::set_memory_limits(); test02(); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc b/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc index 2c9816a397e..ea5e13a422a 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/storage/3.cc @@ -46,7 +46,7 @@ void test03() int main(void) { - __gnu_cxx_test::set_memory_limits(); + __gnu_test::set_memory_limits(); test03(); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc index f0a7868ba4f..10c9b02414f 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc @@ -30,7 +30,7 @@ void test10() bool test = true; const char* name = "tmp_10"; - locale loc(__gnu_cxx_test::try_named_locale("se_NO.UTF-8")); + locale loc(__gnu_test::try_named_locale("se_NO.UTF-8")); locale::global(loc); wcin.imbue(loc); wcout.imbue(loc); diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc index 835282fe449..79d087840c5 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc @@ -34,7 +34,7 @@ void test01() putc(static_cast(i), file); fclose(file); - locale loc (__gnu_cxx_test::try_named_locale("de_DE.ISO-8859-15@euro")); + locale loc (__gnu_test::try_named_locale("de_DE.ISO-8859-15@euro")); locale::global(loc); // Set locale for stdin freopen(name, "r", stdin); 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 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 void f(int) { } // template void f(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 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(A::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 make()"); 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 make()"); 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 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 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 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::mf(N::T) 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 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; } diff --git a/libstdc++-v3/testsuite/ext/stdio_filebuf.cc b/libstdc++-v3/testsuite/ext/stdio_filebuf.cc index ec3481562a0..8b313b3f31f 100644 --- a/libstdc++-v3/testsuite/ext/stdio_filebuf.cc +++ b/libstdc++-v3/testsuite/ext/stdio_filebuf.cc @@ -29,7 +29,7 @@ namespace test { using namespace std; - using __gnu_cxx_test::pod_char; + using __gnu_test::pod_char; typedef short type_t; template class __gnu_cxx::stdio_filebuf >; template class __gnu_cxx::stdio_filebuf >; diff --git a/libstdc++-v3/testsuite/performance/allocator.cc b/libstdc++-v3/testsuite/performance/allocator.cc index 42997e952ca..4cd615e1a83 100644 --- a/libstdc++-v3/testsuite/performance/allocator.cc +++ b/libstdc++-v3/testsuite/performance/allocator.cc @@ -189,7 +189,7 @@ test_ints_mt_alloc(int iterations) // http://gcc.gnu.org/ml/libstdc++/2003-05/msg00231.html int main(void) { - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/complex_norm.cc b/libstdc++-v3/testsuite/performance/complex_norm.cc index 952e727ba56..6ed280c306a 100644 --- a/libstdc++-v3/testsuite/performance/complex_norm.cc +++ b/libstdc++-v3/testsuite/performance/complex_norm.cc @@ -32,7 +32,7 @@ int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/cout_insert_int.cc b/libstdc++-v3/testsuite/performance/cout_insert_int.cc index 66f15df032b..87b1871a7b1 100644 --- a/libstdc++-v3/testsuite/performance/cout_insert_int.cc +++ b/libstdc++-v3/testsuite/performance/cout_insert_int.cc @@ -32,7 +32,7 @@ int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/filebuf_copy.cc b/libstdc++-v3/testsuite/performance/filebuf_copy.cc index f393b92c0a3..608ca2933fa 100644 --- a/libstdc++-v3/testsuite/performance/filebuf_copy.cc +++ b/libstdc++-v3/testsuite/performance/filebuf_copy.cc @@ -32,7 +32,7 @@ int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/filebuf_sputc.cc b/libstdc++-v3/testsuite/performance/filebuf_sputc.cc index cdf030d0fba..c286da0202d 100644 --- a/libstdc++-v3/testsuite/performance/filebuf_sputc.cc +++ b/libstdc++-v3/testsuite/performance/filebuf_sputc.cc @@ -33,7 +33,7 @@ int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/fstream_seek_write.cc b/libstdc++-v3/testsuite/performance/fstream_seek_write.cc index 6c56c27a76b..838eae40245 100644 --- a/libstdc++-v3/testsuite/performance/fstream_seek_write.cc +++ b/libstdc++-v3/testsuite/performance/fstream_seek_write.cc @@ -32,7 +32,7 @@ int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/ifstream_getline.cc b/libstdc++-v3/testsuite/performance/ifstream_getline.cc index b7ca9976078..5f745732a18 100644 --- a/libstdc++-v3/testsuite/performance/ifstream_getline.cc +++ b/libstdc++-v3/testsuite/performance/ifstream_getline.cc @@ -32,7 +32,7 @@ int main () { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/list_create_fill_sort.cc b/libstdc++-v3/testsuite/performance/list_create_fill_sort.cc index 6b3afa5e6cd..ee3ff3369d6 100644 --- a/libstdc++-v3/testsuite/performance/list_create_fill_sort.cc +++ b/libstdc++-v3/testsuite/performance/list_create_fill_sort.cc @@ -39,7 +39,7 @@ static void create_and_fill_and_sort(const unsigned int n) int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/map_create_fill.cc b/libstdc++-v3/testsuite/performance/map_create_fill.cc index 5c3698ba383..b2f52554143 100644 --- a/libstdc++-v3/testsuite/performance/map_create_fill.cc +++ b/libstdc++-v3/testsuite/performance/map_create_fill.cc @@ -37,7 +37,7 @@ static void create_and_fill(const unsigned int n) int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/ofstream_insert_float.cc b/libstdc++-v3/testsuite/performance/ofstream_insert_float.cc index 910291a4e01..6e510416602 100644 --- a/libstdc++-v3/testsuite/performance/ofstream_insert_float.cc +++ b/libstdc++-v3/testsuite/performance/ofstream_insert_float.cc @@ -32,7 +32,7 @@ int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/ofstream_insert_int.cc b/libstdc++-v3/testsuite/performance/ofstream_insert_int.cc index c2e591a0f22..83fbeb835b0 100644 --- a/libstdc++-v3/testsuite/performance/ofstream_insert_int.cc +++ b/libstdc++-v3/testsuite/performance/ofstream_insert_int.cc @@ -32,7 +32,7 @@ int main() { using namespace std; - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; diff --git a/libstdc++-v3/testsuite/performance/string_append.cc b/libstdc++-v3/testsuite/performance/string_append.cc index c07c3af0699..846d424c65c 100644 --- a/libstdc++-v3/testsuite/performance/string_append.cc +++ b/libstdc++-v3/testsuite/performance/string_append.cc @@ -52,7 +52,7 @@ test_append_string(int how_much) void run_benchmark1(int how_much) { - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; start_counters(time, resource); @@ -64,7 +64,7 @@ run_benchmark1(int how_much) void run_benchmark2(int how_much) { - using namespace __gnu_cxx_test; + using namespace __gnu_test; time_counter time; resource_counter resource; start_counters(time, resource); diff --git a/libstdc++-v3/testsuite/testsuite_allocator.cc b/libstdc++-v3/testsuite/testsuite_allocator.cc index 775b2535026..a98e38884d3 100644 --- a/libstdc++-v3/testsuite/testsuite_allocator.cc +++ b/libstdc++-v3/testsuite/testsuite_allocator.cc @@ -30,7 +30,7 @@ #include -namespace __gnu_cxx_test +namespace __gnu_test { allocation_tracker::size_type allocation_tracker::allocationTotal_ = 0; allocation_tracker::size_type allocation_tracker::deallocationTotal_ = 0; diff --git a/libstdc++-v3/testsuite/testsuite_allocator.h b/libstdc++-v3/testsuite/testsuite_allocator.h index 675830eca97..866fe7cce18 100644 --- a/libstdc++-v3/testsuite/testsuite_allocator.h +++ b/libstdc++-v3/testsuite/testsuite_allocator.h @@ -38,7 +38,7 @@ #include #include -namespace __gnu_cxx_test +namespace __gnu_test { class allocation_tracker { @@ -169,7 +169,7 @@ namespace __gnu_cxx_test bool operator!=(const tracker_alloc&, const tracker_alloc&) throw() { return false; } -}; // namespace __gnu_cxx_test +}; // namespace __gnu_test #endif // _GLIBCXX_TESTSUITE_ALLOCATOR_H diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc index 793c1dc6354..79d5ff34411 100644 --- a/libstdc++-v3/testsuite/testsuite_hooks.cc +++ b/libstdc++-v3/testsuite/testsuite_hooks.cc @@ -42,7 +42,7 @@ #include #include -namespace __gnu_cxx_test +namespace __gnu_test { #ifdef _GLIBCXX_MEM_LIMITS void diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/testsuite_hooks.h index 5de881aaa99..f96c0a55b85 100644 --- a/libstdc++-v3/testsuite/testsuite_hooks.h +++ b/libstdc++-v3/testsuite/testsuite_hooks.h @@ -75,7 +75,7 @@ # define unlink(x) #endif -namespace __gnu_cxx_test +namespace __gnu_test { // All macros are defined in GLIBCXX_CONFIGURE_TESTSUITE and imported // from c++config.h @@ -147,7 +147,7 @@ namespace __gnu_cxx_test ~counter() { --count; } }; -#define assert_count(n) VERIFY(__gnu_cxx_test::counter::count == n) +#define assert_count(n) VERIFY(__gnu_test::counter::count == n) // A (static) class for counting copy constructors and possibly throwing an // exception on a desired count. @@ -300,7 +300,7 @@ namespace __gnu_cxx_test inline bool operator==(const copy_tracker& lhs, const copy_tracker& rhs) { return lhs.id() == rhs.id(); } -} // namespace __gnu_cxx_test +} // namespace __gnu_test namespace std { @@ -309,13 +309,13 @@ namespace std // char_traits specialization template<> - struct char_traits<__gnu_cxx_test::pod_char> + struct char_traits<__gnu_test::pod_char> { - typedef __gnu_cxx_test::pod_char char_type; - typedef __gnu_cxx_test::pod_int int_type; + typedef __gnu_test::pod_char char_type; + typedef __gnu_test::pod_int int_type; typedef long pos_type; typedef unsigned long off_type; - typedef __gnu_cxx_test::state state_type; + typedef __gnu_test::state state_type; static void assign(char_type& __c1, const char_type& __c2); diff --git a/libstdc++-v3/testsuite/testsuite_io.h b/libstdc++-v3/testsuite/testsuite_io.h index 6d8c24975a5..a499f9fedc4 100644 --- a/libstdc++-v3/testsuite/testsuite_io.h +++ b/libstdc++-v3/testsuite/testsuite_io.h @@ -33,7 +33,7 @@ #include -namespace __gnu_cxx_test +namespace __gnu_test { // Used to verify the constraints/requirements on get and put areas // as defined in @@ -73,7 +73,7 @@ namespace __gnu_cxx_test } }; -}; // namespace __gnu_cxx_test +}; // namespace __gnu_test #endif // _GLIBCXX_TESTSUITE_IO_H diff --git a/libstdc++-v3/testsuite/testsuite_performance.h b/libstdc++-v3/testsuite/testsuite_performance.h index 0e82137c614..7e87272cacd 100644 --- a/libstdc++-v3/testsuite/testsuite_performance.h +++ b/libstdc++-v3/testsuite/testsuite_performance.h @@ -49,7 +49,7 @@ extern "C" } #endif -namespace __gnu_cxx_test +namespace __gnu_test { class time_counter { @@ -190,7 +190,7 @@ namespace __gnu_cxx_test out << std::endl; out.close(); } -}; // namespace __gnu_cxx_test +}; // namespace __gnu_test #endif // _GLIBCXX_PERFORMANCE_H