diff options
Diffstat (limited to 'libstdc++-v3/testsuite/27_io')
39 files changed, 118 insertions, 106 deletions
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc index 9f2b65bbeaf..2fbfae316af 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13007.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -46,7 +46,7 @@ void test01() bool test __attribute__((unused)) = true; Buf buf; - std::locale loc(std::locale("fr_FR")); + std::locale loc(std::locale(ISO_8859(15,fr_FR))); buf.pubimbue(loc); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc index db3c0745878..7647defecb7 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -31,8 +31,8 @@ void test01() filebuf fb; - fb.pubimbue(locale("en_US")); - fb.pubimbue(locale("en_US")); + fb.pubimbue(locale(ISO_8859(1,en_US))); + fb.pubimbue(locale(ISO_8859(1,en_US))); fb.open("tmp_13171-1", ios_base::out); fb.sputc('F'); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc index 3eef707b861..19ad9fb145d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // { dg-require-fork "" } // { dg-require-mkfifo "" } @@ -41,8 +41,8 @@ bool test01() using namespace std; using namespace __gnu_test; - locale loc_fr(locale("fr_FR")); - locale loc_en(locale("en_US")); + locale loc_fr(locale(ISO_8859(15,fr_FR))); + locale loc_en(locale(ISO_8859(1,en_US))); const char* name = "tmp_fifo_13171-2"; unlink(name); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc index 685302c9ab2..0d9cc8eea55 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -41,9 +41,9 @@ void test01() using namespace std; filebuf fb; - fb.pubimbue(locale(locale("en_US"), new Cvt)); + fb.pubimbue(locale(locale(ISO_8859(1,en_US)), new Cvt)); fb.open("tmp_13171-4", ios_base::out); - fb.pubimbue(locale("fr_FR")); + fb.pubimbue(locale(ISO_8859(15,fr_FR))); fb.sputc('N'); fb.pubsync(); fb.close(); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc index fb2cd2aed94..165cba11147 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // { dg-require-fork "" } // { dg-require-mkfifo "" } @@ -41,8 +41,8 @@ void test01() using namespace std; using namespace __gnu_test; - locale loc_en(locale("en_US")); - locale loc_fr(locale("fr_FR")); + locale loc_en(locale(ISO_8859(1,en_US))); + locale loc_fr(locale(ISO_8859(15,fr_FR))); const char* name = "tmp_fifo_13582-2"; unlink(name); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc index e5aae9ff85f..3a65a99b6fa 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2004-04-16 Petur Runolfsson <peturr02@ru.is> @@ -43,7 +43,7 @@ void test01() bool test __attribute__((unused)) = true; Buf fb; - locale loc_us = locale("en_US"); + locale loc_us = locale(ISO_8859(1,en_US)); fb.pubimbue(loc_us); fb.open("tmp_14975-1", ios_base::out); 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 07776b8a1dc..d5bc14b05d8 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-05-13 Benjamin Kosnik <bkoz@redhat.com> @@ -43,7 +43,7 @@ void test02() VERIFY( p != bad); // According to 27.5.2.2.1, loc == getloc() after pubimbue(loc). - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc_de ); } 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 27abe85184b..27eecb33467 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> @@ -36,10 +36,10 @@ void test07() std::filebuf ob; VERIFY( ob.getloc() == loc ); - locale::global(locale("en_US")); + locale::global(locale(ISO_8859(1,en_US))); VERIFY( ob.getloc() == loc ); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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/13007.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc index 0502e912c27..9d33dfb5044 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -46,7 +46,7 @@ void test01() bool test __attribute__((unused)) = true; Buf buf; - std::locale loc(std::locale("fr_FR")); + std::locale loc(std::locale(ISO_8859(15,fr_FR))); buf.pubimbue(loc); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc index f71a385ce85..3ca37bad495 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -31,19 +31,19 @@ void test01() bool test __attribute__((unused)) = true; using namespace std; - locale::global(locale("fr_FR")); + locale::global(locale(ISO_8859(15,fr_FR))); ios_base::sync_with_stdio(false); - locale::global(locale("en_US")); - cin.imbue(locale("en_US")); - cout.imbue(locale("en_US")); - cerr.imbue(locale("en_US")); - clog.imbue(locale("de_DE")); - wcin.imbue(locale("en_US")); - wcout.imbue(locale("en_US")); - wcerr.imbue(locale("en_US")); - wclog.imbue(locale("de_DE")); + locale::global(locale(ISO_8859(1,en_US))); + cin.imbue(locale(ISO_8859(1,en_US))); + cout.imbue(locale(ISO_8859(1,en_US))); + cerr.imbue(locale(ISO_8859(1,en_US))); + clog.imbue(locale(ISO_8859(15,de_DE))); + wcin.imbue(locale(ISO_8859(1,en_US))); + wcout.imbue(locale(ISO_8859(1,en_US))); + wcerr.imbue(locale(ISO_8859(1,en_US))); + wclog.imbue(locale(ISO_8859(15,de_DE))); cout << 'f' << endl; cerr << 'r' << endl; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc index cb44bdfc39d..5982f28d124 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // { dg-require-fork "" } // { dg-require-mkfifo "" } @@ -41,8 +41,8 @@ void test01() using namespace std; using namespace __gnu_test; - locale loc_en(locale("en_US")); - locale loc_fr(locale("fr_FR")); + locale loc_en(locale(ISO_8859(1,en_US))); + locale loc_fr(locale(ISO_8859(15,fr_FR))); const char* name = "tmp_fifo_13582-2"; unlink(name); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc index 169f2409fed..2f46d9c0114 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2004-01-11 Petur Runolfsson <peturr02@ru.is> @@ -32,8 +32,8 @@ void test01() bool test __attribute__((unused)) = true; using namespace std; - locale loc_en(locale("en_US")); - locale loc_fr(locale("fr_FR")); + locale loc_en(locale(ISO_8859(1,en_US))); + locale loc_fr(locale(ISO_8859(15,fr_FR))); const char* name = "tmp_13582-3.tst"; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc index b3b08ad38e4..85984b29f87 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // { dg-require-fork "" } // { dg-require-mkfifo "" } @@ -42,7 +42,7 @@ bool test01() using namespace __gnu_test; bool test __attribute__((unused)) = true; - locale loc_us = locale("en_US"); + locale loc_us = locale(ISO_8859(1,en_US)); const char* name = "tmp_14975-2"; 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 8c663da964e..3a6650d5d52 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-05-13 Benjamin Kosnik <bkoz@redhat.com> @@ -43,7 +43,7 @@ void test02() VERIFY( p != bad); // According to 27.5.2.2.1, p1, loc == getloc() after pubimbue(loc). - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc_de ); } 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 6b15839bf4d..9e17218883d 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> @@ -36,10 +36,10 @@ void test07() std::wfilebuf ob; VERIFY( ob.getloc() == loc ); - locale::global(locale("en_US")); + locale::global(locale(ISO_8859(1,en_US))); VERIFY( ob.getloc() == loc ); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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/underflow/wchar_t/9520.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc index 297bdcad7bd..6e3e56fa6ef 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE.ISO-8859-15@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-05-03 Petur Runolfsson <peturr02@ru.is> @@ -36,7 +36,7 @@ void test01() putc(static_cast<unsigned char>(i), file); fclose(file); - locale loc (locale("de_DE.ISO-8859-15@euro")); + locale loc (locale(ISO_8859(15,de_DE))); wchar_t buf[1]; wfilebuf fb; fb.pubimbue(loc); 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 61cf9fe312c..d7cd719d820 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 1999-09-20 bkoz @@ -36,7 +36,7 @@ void test03() typedef std::ios_base::fmtflags fmtflags; typedef std::ios_base::iostate iostate; locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); std::ios ios_01(0); std::ios ios_02(0); ios_01.imbue(loc_c); 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 666b672d3a8..306cd60d436 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 1999-11-15 Kevin Ediger <kediger@licor.com> // test the floating point inserters (facet num_put) @@ -42,7 +42,7 @@ test02() os2.setf(ios::fixed); // Check it can be done in a locale with grouping on. - locale loc2 = locale("de_DE"); + locale loc2 = locale(ISO_8859(15,de_DE)); os2.imbue(loc2); os2 << fixed << setprecision(3) << val2 << endl; os2 << endl; diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc index da1e13d0120..a88d4811c20 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // Copyright (C) 2005-2015 Free Software Foundation, Inc. // @@ -39,7 +39,7 @@ test02() os2.setf(wios::fixed); // Check it can be done in a locale with grouping on. - locale loc2 = locale("de_DE"); + locale loc2 = locale(ISO_8859(15,de_DE)); os2.imbue(loc2); os2 << fixed << setprecision(3) << val2 << endl; os2 << endl; diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc index afea72c7176..624fe727298 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc @@ -16,7 +16,7 @@ // <http://www.gnu.org/licenses/>. // { dg-options "-std=gnu++11" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 27.6.3 template class basic_streambuf @@ -105,7 +105,7 @@ void streambuf::test_swap() const int main() { - std::locale loc("de_DE"); + std::locale loc(ISO_8859(15,de_DE)); streambuf s(loc); s.test_copy(); s.test_assign(); diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc index f7b069a97e3..6567615b021 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -46,7 +46,7 @@ void test02() bool test __attribute__((unused)) = true; Buf2 buf; - std::locale loc(std::locale("en_US")); + std::locale loc(std::locale(ISO_8859(1,en_US))); buf.pubimbue(loc); 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 70a65f4982a..00e89322e9a 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 1999-10-11 bkoz @@ -45,10 +45,10 @@ void test08() testbuf ob; VERIFY( ob.getloc() == loc ); - locale::global(locale("en_US")); + locale::global(locale(ISO_8859(1,en_US))); VERIFY( ob.getloc() == loc ); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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_streambuf/imbue/wchar_t/13007-2.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc index 87293b0977c..56176c1a853 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -46,7 +46,7 @@ void test02() bool test __attribute__((unused)) = true; Buf2 buf; - std::locale loc(std::locale("en_US")); + std::locale loc(std::locale(ISO_8859(1,en_US))); buf.pubimbue(loc); diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc index 23528cecade..f5f5cd89e9e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc +++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 1999-10-11 bkoz @@ -45,10 +45,10 @@ void test08() testbuf ob; VERIFY( ob.getloc() == loc ); - locale::global(locale("en_US")); + locale::global(locale(ISO_8859(1,en_US))); VERIFY( ob.getloc() == loc ); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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/imbue/char/9322.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc index 9770cb63901..e2ac91afb64 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> @@ -35,10 +35,10 @@ void test03() std::stringbuf ob; VERIFY( ob.getloc() == loc ); - locale::global(locale("en_US")); + locale::global(locale(ISO_8859(1,en_US))); VERIFY( ob.getloc() == loc ); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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/imbue/wchar_t/9322.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc index ca5b4995b5b..ae32971c05b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> @@ -35,10 +35,10 @@ void test03() std::wstringbuf ob; VERIFY( ob.getloc() == loc ); - locale::global(locale("en_US")); + locale::global(locale(ISO_8859(1,en_US))); VERIFY( ob.getloc() == loc ); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); locale ret = ob.pubimbue(loc_de); VERIFY( ob.getloc() == loc_de ); VERIFY( ret == loc ); diff --git a/libstdc++-v3/testsuite/27_io/ios_base/types/fmtflags/case_label.cc b/libstdc++-v3/testsuite/27_io/ios_base/types/fmtflags/case_label.cc index 591e3714366..e8820c5e84a 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/types/fmtflags/case_label.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/types/fmtflags/case_label.cc @@ -70,5 +70,9 @@ case_labels(bitmask_type b) break; case std::_S_ios_fmtflags_end: break; + case std::_S_ios_fmtflags_min: + break; + case std::_S_ios_fmtflags_max: + break; } } diff --git a/libstdc++-v3/testsuite/27_io/ios_base/types/iostate/case_label.cc b/libstdc++-v3/testsuite/27_io/ios_base/types/iostate/case_label.cc index 44fb44e7a8a..4e4e4f5e623 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/types/iostate/case_label.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/types/iostate/case_label.cc @@ -42,5 +42,9 @@ case_labels(bitmask_type b) break; case std::_S_ios_iostate_end: break; + case std::_S_ios_iostate_min: + break; + case std::_S_ios_iostate_max: + break; } } diff --git a/libstdc++-v3/testsuite/27_io/ios_base/types/openmode/case_label.cc b/libstdc++-v3/testsuite/27_io/ios_base/types/openmode/case_label.cc index 267f8a228b4..8c6672f65ce 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base/types/openmode/case_label.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base/types/openmode/case_label.cc @@ -46,5 +46,9 @@ case_labels(bitmask_type b) break; case std::_S_ios_openmode_end: break; + case std::_S_ios_openmode_min: + break; + case std::_S_ios_openmode_max: + break; } } diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc index 4347557b06e..8514eaefd7b 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc @@ -1,5 +1,5 @@ // { dg-options "-std=gnu++11" } -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-1" } // 2010-03-01 Paolo Carlini <paolo.carlini@oracle.com> @@ -28,7 +28,7 @@ void test01() { bool test __attribute__((unused)) = true; - std::locale loc_de = std::locale("de_DE@euro"); + std::locale loc_de = std::locale(ISO_8859(15,de_DE)); std::istringstream iss; iss.imbue(loc_de); diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc index 054dea9e4aa..ee54d3fc733 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc @@ -1,5 +1,5 @@ // { dg-options "-std=gnu++11" } -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2010-03-01 Paolo Carlini <paolo.carlini@oracle.com> @@ -28,7 +28,7 @@ void test01() { bool test __attribute__((unused)) = true; - std::locale loc_de = std::locale("de_DE@euro"); + std::locale loc_de = std::locale(ISO_8859(15,de_DE)); std::wistringstream iss; iss.imbue(loc_de); diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc index 527278fbca7..ecf097e23b7 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE.utf8" } +// { dg-require-namedlocale "de_DE.UTF-8" } // { dg-options " -std=gnu++11 " } // 2014-04-14 Rüdiger Sonderfeld <ruediger@c-plusplus.de> @@ -32,7 +32,7 @@ void test01() using namespace std; bool test __attribute__((unused)) = true; locale loc_c = locale::classic(); - locale loc_de = locale("de_DE.utf8"); + locale loc_de = locale("de_DE.UTF-8"); VERIFY( loc_de != loc_c ); istringstream iss; iss.imbue(loc_de); diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc index ec109605f7d..cf8dd1c170e 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE.utf8" } +// { dg-require-namedlocale "de_DE.UTF-8" } // { dg-options " -std=gnu++11 " } // 2014-04-14 Rüdiger Sonderfeld <ruediger@c-plusplus.de> @@ -33,7 +33,7 @@ void test01() using namespace std; bool test __attribute__((unused)) = true; locale loc_c = locale::classic(); - locale loc_de = locale("de_DE.utf8"); + locale loc_de = locale("de_DE.UTF-8"); VERIFY( loc_de != loc_c ); wistringstream iss; iss.imbue(loc_de); diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc index e01ccba09d4..b4e20928435 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc @@ -1,5 +1,5 @@ // { dg-options "-std=gnu++11" } -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2010-03-01 Paolo Carlini <paolo.carlini@oracle.com> @@ -28,7 +28,7 @@ void test01() { bool test __attribute__((unused)) = true; - std::locale loc_de = std::locale("de_DE@euro"); + std::locale loc_de = std::locale(ISO_8859(15,de_DE)); std::ostringstream oss; oss.imbue(loc_de); diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc index f39e854164e..d67570ab350 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc @@ -1,5 +1,5 @@ // { dg-options "-std=gnu++11" } -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2010-03-01 Paolo Carlini <paolo.carlini@oracle.com> @@ -28,7 +28,7 @@ void test01() { bool test __attribute__((unused)) = true; - std::locale loc_de = std::locale("de_DE@euro"); + std::locale loc_de = std::locale(ISO_8859(15,de_DE)); std::wostringstream oss; oss.imbue(loc_de); diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc index 25cf6c46b79..82a92e31e47 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE.utf8" } +// { dg-require-namedlocale "de_DE.UTF-8" } // { dg-options " -std=gnu++11 " } // 2014-04-14 Rüdiger Sonderfeld <ruediger@c-plusplus.de> @@ -32,7 +32,7 @@ void test01() using namespace std; bool test __attribute__((unused)) = true; locale loc_c = locale::classic(); - locale loc_de = locale("de_DE.utf8"); + locale loc_de = locale("de_DE.UTF-8"); VERIFY( loc_de != loc_c ); ostringstream oss; oss.imbue(loc_de); diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc index 44521fc5ed0..dafa83580a7 100644 --- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE.utf8" } +// { dg-require-namedlocale "de_DE.UTF-8" } // { dg-options " -std=gnu++11 " } // 2014-04-14 Rüdiger Sonderfeld <ruediger@c-plusplus.de> @@ -32,7 +32,7 @@ void test01() using namespace std; bool test __attribute__((unused)) = true; locale loc_c = locale::classic(); - locale loc_de = locale("de_DE.utf8"); + locale loc_de = locale("de_DE.UTF-8"); VERIFY( loc_de != loc_c ); wostringstream oss; oss.imbue(loc_de); diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc index 47a419f2e0d..4fd1bfae023 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc @@ -36,13 +36,13 @@ void test01() if (wcin.get(c) && !isspace(c, wcin.getloc())) { str.push_back(c); - wcin.imbue(locale("en_US")); + wcin.imbue(locale(ISO_8859(1,en_US))); } if (wcin.get(c) && !isspace(c, wcin.getloc())) { str.push_back(c); - wcin.imbue(locale("fr_FR")); + wcin.imbue(locale(ISO_8859(15,fr_FR))); } while (wcin.get(c) && !isspace(c, wcin.getloc())) 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 e2412e4996c..94d3415bc9b 100644 --- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc +++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE.ISO-8859-15@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-04-30 Petur Runolfsson <peturr02@ru.is> @@ -35,7 +35,7 @@ void test01() putc(static_cast<unsigned char>(i), file); fclose(file); - locale loc (locale("de_DE.ISO-8859-15@euro")); + locale loc (locale(ISO_8859(15,de_DE))); locale::global(loc); // Set locale for stdin VERIFY( freopen(name, "r", stdin) ); |