diff options
Diffstat (limited to 'libstdc++-v3/testsuite/22_locale/money_put')
11 files changed, 32 insertions, 32 deletions
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 62ef407b0cd..8c493e6f688 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> @@ -35,7 +35,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE@euro"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); // sanity check the data is correct. 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 8d58abaab40..40dd26373e3 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> @@ -35,7 +35,7 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_c != loc_hk ); // sanity check the data is correct. 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 d15ccc55100..386e08bba97 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> @@ -35,7 +35,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE@euro"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); // sanity check the data is correct. diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc index 33b5be87ef5..dc0396173d3 100644 --- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc +++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "es_ES" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } // Copyright (C) 2004-2015 Free Software Foundation, Inc. // @@ -27,8 +27,8 @@ int main() using namespace std; bool test __attribute__((unused)) = true; - locale l1 = locale("de_DE"); - locale l2 = locale("es_ES"); + locale l1 = locale(ISO_8859(15,de_DE)); + locale l2 = locale(ISO_8859(15,es_ES)); const money_put<char>& mp = use_facet<money_put<char> >(l1); ostringstream oss; 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 6d33c558855..6666050d496 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "de_DE@euro" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -59,6 +59,6 @@ int main() two.push_back(&test04); two.push_back(&test05); two.push_back(&test06); - run_tests_wrapped_env("de_DE", "LANG", two); + run_tests_wrapped_env(ISO_8859(15,de_DE), "LANG", two); return 0; } 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 7b773998148..eacfcbcd46d 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE@euro" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -59,6 +59,6 @@ int main() two.push_back(&test04); two.push_back(&test05); two.push_back(&test06); - run_tests_wrapped_locale("ja_JP.eucjp", two); + run_tests_wrapped_locale("ja_JP.eucJP", two); return 0; } 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 1594874ceef..35666414293 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> @@ -35,7 +35,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE@euro"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); // sanity check the data is correct. 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 b75b88b0e14..69ce62c5ff5 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> @@ -35,7 +35,7 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_c != loc_hk ); // sanity check the data is correct. 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 7c5dec2c28d..e54c692be91 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-27 Benjamin Kosnik <bkoz@redhat.com> @@ -35,7 +35,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE@euro"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); // sanity check the data is correct. 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 6d33c558855..6666050d496 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "de_DE@euro" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -59,6 +59,6 @@ int main() two.push_back(&test04); two.push_back(&test05); two.push_back(&test06); - run_tests_wrapped_env("de_DE", "LANG", two); + run_tests_wrapped_env(ISO_8859(15,de_DE), "LANG", two); return 0; } 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 7b773998148..eacfcbcd46d 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE@euro" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik <bkoz@redhat.com> @@ -59,6 +59,6 @@ int main() two.push_back(&test04); two.push_back(&test05); two.push_back(&test06); - run_tests_wrapped_locale("ja_JP.eucjp", two); + run_tests_wrapped_locale("ja_JP.eucJP", two); return 0; } |