From: John Marino Date: Fri, 13 Nov 2015 15:25:48 +0000 (+0000) Subject: Improve portability of named locale tests X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4216708a0073b10ffca943dc05c861d4d16f9c33;p=gcc.git Improve portability of named locale tests 2015-11-13 John Marino * testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc: Use portable locale name * testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: Likewise. * testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: Likewise. * testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: Likewise. * testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: Likewise. * testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/in/char/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/in/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/in/wchar_t/2.cc: Likewise. * testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/length/char/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/length/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/length/wchar_t/2.cc: Likewise. * testsuite/22_locale/codecvt/length/wchar_t/3.cc: Likewise. * testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: Likewise. * testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: Likewise. * testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/out/char/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/out/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/out/wchar_t/2.cc: Likewise. * testsuite/22_locale/codecvt/out/wchar_t/7.cc: Likewise. * testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: Likewise. * testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: Likewise. * testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/codecvt_byname/50714.cc: Likewise. * testsuite/22_locale/collate/compare/char/1.cc: Likewise. * testsuite/22_locale/collate/compare/char/2.cc: Likewise. * testsuite/22_locale/collate/compare/char/3.cc: Likewise. * testsuite/22_locale/collate/compare/char/wrapped_env.cc: Likewise. * testsuite/22_locale/collate/compare/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/collate/compare/wchar_t/1.cc: Likewise. * testsuite/22_locale/collate/compare/wchar_t/2.cc: Likewise. * testsuite/22_locale/collate/compare/wchar_t/3.cc: Likewise. * testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/collate/hash/char/2.cc: Likewise. * testsuite/22_locale/collate/hash/char/wrapped_env.cc: Likewise. * testsuite/22_locale/collate/hash/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/collate/hash/wchar_t/2.cc: Likewise. * testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/collate/transform/char/2.cc: Likewise. * testsuite/22_locale/collate/transform/char/3.cc: Likewise. * testsuite/22_locale/collate/transform/char/wrapped_env.cc: Likewise. * testsuite/22_locale/collate/transform/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/collate/transform/wchar_t/2.cc: Likewise. * testsuite/22_locale/collate/transform/wchar_t/3.cc: Likewise. * testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/collate_byname/named_equivalence.cc: Likewise. * testsuite/22_locale/ctype/cons/char/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/cons/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/is/char/2.cc: Likewise. * testsuite/22_locale/ctype/is/char/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/is/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/is/wchar_t/2.cc: Likewise. * testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/narrow/char/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/scan/char/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/scan/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/to/char/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/to/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/widen/char/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/widen/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/ctype/widen/wchar_t/2.cc: Likewise. * testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/facet/2.cc: Likewise. * testsuite/22_locale/locale/cons/12352.cc: Likewise. * testsuite/22_locale/locale/cons/12658_thread-1.cc: Likewise. * testsuite/22_locale/locale/cons/12658_thread-2.cc: Likewise. * testsuite/22_locale/locale/cons/2.cc: Likewise. * testsuite/22_locale/locale/cons/38365.cc: Likewise. * testsuite/22_locale/locale/cons/38368.cc: Likewise. * testsuite/22_locale/locale/cons/4.cc: Likewise. * testsuite/22_locale/locale/cons/40184.cc: Likewise. * testsuite/22_locale/locale/cons/7.cc: Likewise. * testsuite/22_locale/locale/global_locale_objects/14071.cc: Likewise. * testsuite/22_locale/locale/global_locale_objects/2.cc: Likewise. * testsuite/22_locale/messages/13631.cc: Likewise. * testsuite/22_locale/messages/members/char/1.cc: Likewise. * testsuite/22_locale/messages/members/char/2.cc: Likewise. * testsuite/22_locale/messages/members/char/3.cc: Likewise. * testsuite/22_locale/messages/members/char/wrapped_env.cc: Likewise. * testsuite/22_locale/messages/members/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/messages_byname/named_equivalence.cc: Likewise. * testsuite/22_locale/money_get/get/char/1.cc: Likewise. * testsuite/22_locale/money_get/get/char/10.cc: Likewise. * testsuite/22_locale/money_get/get/char/11.cc: Likewise. * testsuite/22_locale/money_get/get/char/11528.cc: Likewise. * testsuite/22_locale/money_get/get/char/12.cc: Likewise. * testsuite/22_locale/money_get/get/char/13.cc: Likewise. * testsuite/22_locale/money_get/get/char/15.cc: Likewise. * testsuite/22_locale/money_get/get/char/16.cc: Likewise. * testsuite/22_locale/money_get/get/char/17.cc: Likewise. * testsuite/22_locale/money_get/get/char/18.cc: Likewise. * testsuite/22_locale/money_get/get/char/2.cc: Likewise. * testsuite/22_locale/money_get/get/char/3.cc: Likewise. * testsuite/22_locale/money_get/get/char/4.cc: Likewise. * testsuite/22_locale/money_get/get/char/wrapped_env.cc: Likewise. * testsuite/22_locale/money_get/get/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/1.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/10.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/11.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/11528.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/12.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/13.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/15.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/16.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/17.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/18.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/2.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/3.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/4.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/money_put/put/char/1.cc: Likewise. * testsuite/22_locale/money_put/put/char/2.cc: Likewise. * testsuite/22_locale/money_put/put/char/3.cc: Likewise. * testsuite/22_locale/money_put/put/char/9780-3.cc: Likewise. * testsuite/22_locale/money_put/put/char/wrapped_env.cc: Likewise. * testsuite/22_locale/money_put/put/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/money_put/put/wchar_t/1.cc: Likewise. * testsuite/22_locale/money_put/put/wchar_t/2.cc: Likewise. * testsuite/22_locale/money_put/put/wchar_t/3.cc: Likewise. * testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/moneypunct/40712.cc: Likewise. * testsuite/22_locale/moneypunct/members/char/2.cc: Likewise. * testsuite/22_locale/moneypunct/members/char/wrapped_env.cc: Likewise. * testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/moneypunct/members/wchar_t/2.cc: Likewise. * testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/moneypunct_byname/named_equivalence.cc: Likewise. * testsuite/22_locale/num_get/get/char/1.cc: Likewise. * testsuite/22_locale/num_get/get/char/3.cc: Likewise. * testsuite/22_locale/num_get/get/char/5.cc: Likewise. * testsuite/22_locale/num_get/get/char/6.cc: Likewise. * testsuite/22_locale/num_get/get/char/9.cc: Likewise. * testsuite/22_locale/num_get/get/char/wrapped_env.cc: Likewise. * testsuite/22_locale/num_get/get/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/num_get/get/wchar_t/1.cc: Likewise. * testsuite/22_locale/num_get/get/wchar_t/3.cc: Likewise. * testsuite/22_locale/num_get/get/wchar_t/5.cc: Likewise. * testsuite/22_locale/num_get/get/wchar_t/6.cc: Likewise. * testsuite/22_locale/num_get/get/wchar_t/9.cc: Likewise. * testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/num_put/put/char/1.cc: Likewise. * testsuite/22_locale/num_put/put/char/20909.cc: Likewise. * testsuite/22_locale/num_put/put/char/20914.cc: Likewise. * testsuite/22_locale/num_put/put/char/3.cc: Likewise. * testsuite/22_locale/num_put/put/char/5.cc: Likewise. * testsuite/22_locale/num_put/put/char/9780-2.cc: Likewise. * testsuite/22_locale/num_put/put/char/wrapped_env.cc: Likewise. * testsuite/22_locale/num_put/put/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/num_put/put/wchar_t/1.cc: Likewise. * testsuite/22_locale/num_put/put/wchar_t/20909.cc: Likewise. * testsuite/22_locale/num_put/put/wchar_t/20914.cc: Likewise. * testsuite/22_locale/num_put/put/wchar_t/3.cc: Likewise. * testsuite/22_locale/num_put/put/wchar_t/5.cc: Likewise. * testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/numpunct/members/char/2.cc: Likewise. * testsuite/22_locale/numpunct/members/char/3.cc: Likewise. * testsuite/22_locale/numpunct/members/char/wrapped_env.cc: Likewise. * testsuite/22_locale/numpunct/members/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/numpunct/members/wchar_t/2.cc: Likewise. * testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/numpunct_byname/named_equivalence.cc: Likewise. * testsuite/22_locale/time_get/date_order/char/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get/char/2.cc: Likewise. * testsuite/22_locale/time_get/get/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/12750.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/2.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/26701.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/12750.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/26701.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/4.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/char/2.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/1.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/2.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/1.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/2.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/38081-1.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/38081-2.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_year/char/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_put/put/char/17038.cc: Likewise. * testsuite/22_locale/time_put/put/char/2.cc: Likewise. * testsuite/22_locale/time_put/put/char/3.cc: Likewise. * testsuite/22_locale/time_put/put/char/4.cc: Likewise. * testsuite/22_locale/time_put/put/char/6.cc: Likewise. * testsuite/22_locale/time_put/put/char/7.cc: Likewise. * testsuite/22_locale/time_put/put/char/8.cc: Likewise. * testsuite/22_locale/time_put/put/char/9780-1.cc: Likewise. * testsuite/22_locale/time_put/put/char/wrapped_env.cc: Likewise. * testsuite/22_locale/time_put/put/char/wrapped_locale.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/17038.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/2.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/3.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/6.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/7.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/8.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc: Likewise. * testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/char/13007.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/char/2.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/char/9322.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc: Likewise. * testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc: Likewise. * testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc: Likewise. * testsuite/27_io/basic_ios/copyfmt/char/2.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc: Likewise. * testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc: Likewise. * testsuite/27_io/basic_streambuf/cons/57394.cc: Likewise. * testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc: Likewise. * testsuite/27_io/basic_streambuf/imbue/char/9322.cc: Likewise. * testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc: Likewise. * testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc: Likewise. * testsuite/27_io/basic_stringbuf/imbue/char/9322.cc: Likewise. * testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc: Likewise. * testsuite/27_io/manipulators/extended/get_money/char/1.cc: Likewise. * testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc: Likewise. * testsuite/27_io/manipulators/extended/get_time/char/2.cc: Likewise. * testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc: Likewise. * testsuite/27_io/manipulators/extended/put_money/char/1.cc: Likewise. * testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc: Likewise. * testsuite/27_io/manipulators/extended/put_time/char/2.cc: Likewise. * testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc: Likewise. * testsuite/27_io/objects/wchar_t/13582-1_xin.cc: Likewise. * testsuite/27_io/objects/wchar_t/9520.cc: Likewise. * testsuite/lib/libstdc++.exp (check_v3_target_namedlocale): Check for named locale as appropriate for target. * testsuite/util/testsuite_hooks.h (ISO_8859): Define macro to form target's preferred form of locale name. From-SVN: r230329 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index dd86ffb1eb4..4daa0c308a7 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,360 @@ +2015-11-13 John Marino + + * testsuite/22_locale/codecvt/always_noconv/char/wrapped_env.cc: + Use portable locale name + * testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: Likewise. + * testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: Likewise. + * testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: Likewise. + * testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: Likewise. + * testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/codecvt/in/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/in/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/codecvt/in/wchar_t/2.cc: Likewise. + * testsuite/22_locale/codecvt/in/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/codecvt/length/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/length/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/codecvt/length/wchar_t/2.cc: Likewise. + * testsuite/22_locale/codecvt/length/wchar_t/3.cc: Likewise. + * testsuite/22_locale/codecvt/length/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: Likewise. + * testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: Likewise. + * testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/codecvt/out/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/out/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/codecvt/out/wchar_t/2.cc: Likewise. + * testsuite/22_locale/codecvt/out/wchar_t/7.cc: Likewise. + * testsuite/22_locale/codecvt/out/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: Likewise. + * testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: Likewise. + * testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/codecvt_byname/50714.cc: Likewise. + * testsuite/22_locale/collate/compare/char/1.cc: Likewise. + * testsuite/22_locale/collate/compare/char/2.cc: Likewise. + * testsuite/22_locale/collate/compare/char/3.cc: Likewise. + * testsuite/22_locale/collate/compare/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/collate/compare/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/collate/compare/wchar_t/1.cc: Likewise. + * testsuite/22_locale/collate/compare/wchar_t/2.cc: Likewise. + * testsuite/22_locale/collate/compare/wchar_t/3.cc: Likewise. + * testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/collate/hash/char/2.cc: Likewise. + * testsuite/22_locale/collate/hash/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/collate/hash/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/collate/hash/wchar_t/2.cc: Likewise. + * testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/collate/transform/char/2.cc: Likewise. + * testsuite/22_locale/collate/transform/char/3.cc: Likewise. + * testsuite/22_locale/collate/transform/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/collate/transform/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/collate/transform/wchar_t/2.cc: Likewise. + * testsuite/22_locale/collate/transform/wchar_t/3.cc: Likewise. + * testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/collate_byname/named_equivalence.cc: Likewise. + * testsuite/22_locale/ctype/cons/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/cons/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/is/char/2.cc: Likewise. + * testsuite/22_locale/ctype/is/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/is/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/is/wchar_t/2.cc: Likewise. + * testsuite/22_locale/ctype/is/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/narrow/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/scan/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/scan/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/to/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/to/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/widen/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/widen/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/ctype/widen/wchar_t/2.cc: Likewise. + * testsuite/22_locale/ctype/widen/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/facet/2.cc: Likewise. + * testsuite/22_locale/locale/cons/12352.cc: Likewise. + * testsuite/22_locale/locale/cons/12658_thread-1.cc: Likewise. + * testsuite/22_locale/locale/cons/12658_thread-2.cc: Likewise. + * testsuite/22_locale/locale/cons/2.cc: Likewise. + * testsuite/22_locale/locale/cons/38365.cc: Likewise. + * testsuite/22_locale/locale/cons/38368.cc: Likewise. + * testsuite/22_locale/locale/cons/4.cc: Likewise. + * testsuite/22_locale/locale/cons/40184.cc: Likewise. + * testsuite/22_locale/locale/cons/7.cc: Likewise. + * testsuite/22_locale/locale/global_locale_objects/14071.cc: Likewise. + * testsuite/22_locale/locale/global_locale_objects/2.cc: Likewise. + * testsuite/22_locale/messages/13631.cc: Likewise. + * testsuite/22_locale/messages/members/char/1.cc: Likewise. + * testsuite/22_locale/messages/members/char/2.cc: Likewise. + * testsuite/22_locale/messages/members/char/3.cc: Likewise. + * testsuite/22_locale/messages/members/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/messages/members/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/messages_byname/named_equivalence.cc: Likewise. + * testsuite/22_locale/money_get/get/char/1.cc: Likewise. + * testsuite/22_locale/money_get/get/char/10.cc: Likewise. + * testsuite/22_locale/money_get/get/char/11.cc: Likewise. + * testsuite/22_locale/money_get/get/char/11528.cc: Likewise. + * testsuite/22_locale/money_get/get/char/12.cc: Likewise. + * testsuite/22_locale/money_get/get/char/13.cc: Likewise. + * testsuite/22_locale/money_get/get/char/15.cc: Likewise. + * testsuite/22_locale/money_get/get/char/16.cc: Likewise. + * testsuite/22_locale/money_get/get/char/17.cc: Likewise. + * testsuite/22_locale/money_get/get/char/18.cc: Likewise. + * testsuite/22_locale/money_get/get/char/2.cc: Likewise. + * testsuite/22_locale/money_get/get/char/3.cc: Likewise. + * testsuite/22_locale/money_get/get/char/4.cc: Likewise. + * testsuite/22_locale/money_get/get/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/money_get/get/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/1.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/10.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/11.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/11528.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/12.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/13.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/15.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/16.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/17.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/18.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/2.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/3.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/4.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/money_put/put/char/1.cc: Likewise. + * testsuite/22_locale/money_put/put/char/2.cc: Likewise. + * testsuite/22_locale/money_put/put/char/3.cc: Likewise. + * testsuite/22_locale/money_put/put/char/9780-3.cc: Likewise. + * testsuite/22_locale/money_put/put/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/money_put/put/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/money_put/put/wchar_t/1.cc: Likewise. + * testsuite/22_locale/money_put/put/wchar_t/2.cc: Likewise. + * testsuite/22_locale/money_put/put/wchar_t/3.cc: Likewise. + * testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/moneypunct/40712.cc: Likewise. + * testsuite/22_locale/moneypunct/members/char/2.cc: Likewise. + * testsuite/22_locale/moneypunct/members/char/wrapped_env.cc: + Likewise. + * testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/moneypunct/members/wchar_t/2.cc: Likewise. + * testsuite/22_locale/moneypunct/members/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/moneypunct_byname/named_equivalence.cc: + Likewise. + * testsuite/22_locale/num_get/get/char/1.cc: Likewise. + * testsuite/22_locale/num_get/get/char/3.cc: Likewise. + * testsuite/22_locale/num_get/get/char/5.cc: Likewise. + * testsuite/22_locale/num_get/get/char/6.cc: Likewise. + * testsuite/22_locale/num_get/get/char/9.cc: Likewise. + * testsuite/22_locale/num_get/get/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/num_get/get/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/num_get/get/wchar_t/1.cc: Likewise. + * testsuite/22_locale/num_get/get/wchar_t/3.cc: Likewise. + * testsuite/22_locale/num_get/get/wchar_t/5.cc: Likewise. + * testsuite/22_locale/num_get/get/wchar_t/6.cc: Likewise. + * testsuite/22_locale/num_get/get/wchar_t/9.cc: Likewise. + * testsuite/22_locale/num_get/get/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/num_put/put/char/1.cc: Likewise. + * testsuite/22_locale/num_put/put/char/20909.cc: Likewise. + * testsuite/22_locale/num_put/put/char/20914.cc: Likewise. + * testsuite/22_locale/num_put/put/char/3.cc: Likewise. + * testsuite/22_locale/num_put/put/char/5.cc: Likewise. + * testsuite/22_locale/num_put/put/char/9780-2.cc: Likewise. + * testsuite/22_locale/num_put/put/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/num_put/put/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/num_put/put/wchar_t/1.cc: Likewise. + * testsuite/22_locale/num_put/put/wchar_t/20909.cc: Likewise. + * testsuite/22_locale/num_put/put/wchar_t/20914.cc: Likewise. + * testsuite/22_locale/num_put/put/wchar_t/3.cc: Likewise. + * testsuite/22_locale/num_put/put/wchar_t/5.cc: Likewise. + * testsuite/22_locale/num_put/put/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/22_locale/numpunct/members/char/2.cc: Likewise. + * testsuite/22_locale/numpunct/members/char/3.cc: Likewise. + * testsuite/22_locale/numpunct/members/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/numpunct/members/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/numpunct/members/wchar_t/2.cc: Likewise. + * testsuite/22_locale/numpunct/members/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/numpunct_byname/named_equivalence.cc: Likewise. + * testsuite/22_locale/time_get/date_order/char/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/date_order/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/date_order/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get/char/2.cc: Likewise. + * testsuite/22_locale/time_get/get/wchar_t/2.cc: Likewise. + * testsuite/22_locale/time_get/get_date/char/12750.cc: Likewise. + * testsuite/22_locale/time_get/get_date/char/2.cc: Likewise. + * testsuite/22_locale/time_get/get_date/char/26701.cc: Likewise. + * testsuite/22_locale/time_get/get_date/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_date/wchar_t/12750.cc: Likewise. + * testsuite/22_locale/time_get/get_date/wchar_t/2.cc: Likewise. + * testsuite/22_locale/time_get/get_date/wchar_t/26701.cc: Likewise. + * testsuite/22_locale/time_get/get_date/wchar_t/4.cc: Likewise. + * testsuite/22_locale/time_get/get_date/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/get_date/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_monthname/char/2.cc: Likewise. + * testsuite/22_locale/time_get/get_monthname/char/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc: Likewise. + * testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/get_monthname/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_time/char/1.cc: Likewise. + * testsuite/22_locale/time_get/get_time/char/2.cc: Likewise. + * testsuite/22_locale/time_get/get_time/char/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_time/wchar_t/1.cc: Likewise. + * testsuite/22_locale/time_get/get_time/wchar_t/2.cc: Likewise. + * testsuite/22_locale/time_get/get_time/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/get_time/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_weekday/char/2.cc: Likewise. + * testsuite/22_locale/time_get/get_weekday/char/38081-1.cc: Likewise. + * testsuite/22_locale/time_get/get_weekday/char/38081-2.cc: Likewise. + * testsuite/22_locale/time_get/get_weekday/char/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc: Likewise. + * testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/get_weekday/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_year/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_get/get_year/wchar_t/wrapped_env.cc: + Likewise. + * testsuite/22_locale/time_get/get_year/wchar_t/wrapped_locale.cc: + Likewise. + * testsuite/22_locale/time_put/put/char/17038.cc: Likewise. + * testsuite/22_locale/time_put/put/char/2.cc: Likewise. + * testsuite/22_locale/time_put/put/char/3.cc: Likewise. + * testsuite/22_locale/time_put/put/char/4.cc: Likewise. + * testsuite/22_locale/time_put/put/char/6.cc: Likewise. + * testsuite/22_locale/time_put/put/char/7.cc: Likewise. + * testsuite/22_locale/time_put/put/char/8.cc: Likewise. + * testsuite/22_locale/time_put/put/char/9780-1.cc: Likewise. + * testsuite/22_locale/time_put/put/char/wrapped_env.cc: Likewise. + * testsuite/22_locale/time_put/put/char/wrapped_locale.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/17038.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/2.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/3.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/4.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/6.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/7.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/8.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/wrapped_env.cc: Likewise. + * testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/char/13007.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/char/13171-1.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/char/13171-2.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/char/13171-4.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/char/13582-2.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/char/2.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/char/9322.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/wchar_t/13171-3.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-2.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc: Likewise. + * testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc: Likewise. + * testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc: Likewise. + * testsuite/27_io/basic_ios/copyfmt/char/2.cc: Likewise. + * testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc: + Likewise. + * testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc: + Likewise. + * testsuite/27_io/basic_streambuf/cons/57394.cc: Likewise. + * testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc: Likewise. + * testsuite/27_io/basic_streambuf/imbue/char/9322.cc: Likewise. + * testsuite/27_io/basic_streambuf/imbue/wchar_t/13007-2.cc: Likewise. + * testsuite/27_io/basic_streambuf/imbue/wchar_t/9322.cc: Likewise. + * testsuite/27_io/basic_stringbuf/imbue/char/9322.cc: Likewise. + * testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc: Likewise. + * testsuite/27_io/manipulators/extended/get_money/char/1.cc: Likewise. + * testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc: + Likewise. + * testsuite/27_io/manipulators/extended/get_time/char/2.cc: Likewise. + * testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc: + Likewise. + * testsuite/27_io/manipulators/extended/put_money/char/1.cc: Likewise. + * testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc: + Likewise. + * testsuite/27_io/manipulators/extended/put_time/char/2.cc: Likewise. + * testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc: + Likewise. + * testsuite/27_io/objects/wchar_t/13582-1_xin.cc: Likewise. + * testsuite/27_io/objects/wchar_t/9520.cc: Likewise. + * testsuite/lib/libstdc++.exp (check_v3_target_namedlocale): Check + for named locale as appropriate for target. + * testsuite/util/testsuite_hooks.h (ISO_8859): Define macro to form + target's preferred form of locale name. + 2015-11-13 Jennifer Yao Jonathan Wakely 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/always_noconv/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/always_noconv/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc index 37ac8870a9e..7fbcd85f5fb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -27,14 +27,14 @@ // Required instantiation // codecvt // -// Baseline test in ISO-8859-1 locale +// Baseline test in ISO8859-1 locale void test02() { using namespace std; bool test __attribute__((unused)) = true; typedef codecvt w_codecvt; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); 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 9f50fc45bfd..6d737843a14 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -27,14 +27,14 @@ // Required instantiation // codecvt // -// Baseline test in ISO-8859-15 locale +// Baseline test in ISO8859-1 locale void test03() { using namespace std; bool test __attribute__((unused)) = true; typedef codecvt w_codecvt; - locale loc = locale("en_US.ISO-8859-15"); + locale loc = locale(ISO_8859(1,en_US)); 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/always_noconv/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/encoding/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/encoding/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/encoding/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc index 96b15677a25..5e21cbb09f7 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -27,19 +27,19 @@ // Required instantiation // codecvt // -// Test do_encoding with ISO-8859-1 locale. +// Test do_encoding with ISO8859-1 locale. void test02() { using namespace std; typedef codecvt w_codecvt; bool test __attribute__((unused)) = true; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); int i = cvt->encoding(); - VERIFY( i == 1 ); // ISO-8859-1 is a single-byte encoding + VERIFY( i == 1 ); // ISO8859-1 is a single-byte encoding } int main () 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 b5d1d40c6fe..a2070f60e40 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -27,19 +27,19 @@ // Required instantiation // codecvt // -// Test do_encoding with ISO-8859-15 locale. +// Test do_encoding with ISO8859-1 locale. void test03() { using namespace std; typedef codecvt w_codecvt; bool test __attribute__((unused)) = true; - locale loc = locale("en_US.ISO-8859-15"); + locale loc = locale(ISO_8859(1,en_US)); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); int i = cvt->encoding(); - VERIFY( i == 1 ); // ISO-8859-15 is a single-byte encoding + VERIFY( i == 1 ); // ISO8859-1 is a single-byte encoding } int main () 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/encoding/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/in/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/in/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/in/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc index a0445adb2af..21d1aed7f08 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -41,7 +41,7 @@ zero_state(std::mbstate_t& state) // Required instantiation // codecvt // -// Baseline test for ISO-8859-1. Converts entire charset. +// Baseline test for ISO8859-1. Converts entire charset. void test02() { using namespace std; @@ -90,7 +90,7 @@ void test02() wmemset(i_ref, 0xdeadbeef, size + 1); int_type* ito_next; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/in/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/length/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/length/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/length/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc index 5c4fbb0a684..d108a431b27 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -63,7 +63,7 @@ void test02() "\xff"; int size = strlen(e_lit); - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); 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 ed9aec33859..e39a6fa33b9 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -63,7 +63,7 @@ void test03() "\xff"; int size = strlen(e_lit); - locale loc = locale("en_US.ISO-8859-15"); + locale loc = locale(ISO_8859(1,en_US)); 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/length/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/max_length/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/max_length/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/max_length/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc index d0d3831a1ff..7b0c286be5d 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -32,12 +32,12 @@ void test02() bool test __attribute__((unused)) = true; typedef codecvt w_codecvt; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); int k = cvt->max_length(); - VERIFY( k == 1 ); // ISO-8859-1 is a single-byte encoding + VERIFY( k == 1 ); // ISO8859-1 is a single-byte encoding } int main () 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 269a15d8056..3111fc6ad8a 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -32,12 +32,12 @@ void test03() bool test __attribute__((unused)) = true; typedef codecvt w_codecvt; - locale loc = locale("en_US.ISO-8859-15"); + locale loc = locale(ISO_8859(1,en_US)); locale::global(loc); const w_codecvt* cvt = &use_facet(loc); int k = cvt->max_length(); - VERIFY( k == 1 ); // ISO-8859-15 is a single-byte encoding + VERIFY( k == 1 ); // ISO8859-1 is a single-byte encoding } int main () 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/max_length/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/out/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/out/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/out/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc index 9939eb4481b..f3628b4e31c 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -88,7 +88,7 @@ void test02() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); 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 7027815cda6..8fad77fc2ad 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -60,7 +60,7 @@ void test03() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/out/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/unshift/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/unshift/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/unshift/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc index c39e4a59ac9..7c63cb3298e 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -73,7 +73,7 @@ void test02() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); 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 5e1a47f22f7..b048854d676 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-02-06 Petur Runolfsson @@ -87,7 +87,7 @@ void test03() memset(e_ref, 0xf0, size + 1); ext_type* eto_next; - locale loc = locale("en_US.ISO-8859-15"); + locale loc = locale(ISO_8859(1,en_US)); 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt/unshift/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/codecvt_byname/50714.cc b/libstdc++-v3/testsuite/22_locale/codecvt_byname/50714.cc index a728d12050f..1c457968729 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt_byname/50714.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt_byname/50714.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // Copyright (C) 2011-2015 Free Software Foundation, Inc. // @@ -19,6 +19,7 @@ #include #include +#include #define mychar __gnu_cxx::character @@ -84,7 +85,7 @@ void test01() } { locale loc2(locale::classic(), - new codecvt_byname("de_DE")); + new codecvt_byname(ISO_8859(15,de_DE))); } } 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 e13c65e78f6..4f55a555d63 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -36,9 +36,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); + locale loc_de = locale(ISO_8859(15,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 31e71d5f050..e48ff8a7574 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -26,7 +26,7 @@ #include #include -// Check German "de_DE" locale. +// Check German "de_DE.ISO8859-15" locale. void test02() { using namespace std; @@ -36,9 +36,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); + locale loc_de = locale(ISO_8859(15,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 066e0c98370..d18f66bcd4b 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-02-24 Petur Runolfsson @@ -34,7 +34,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 39c151f60c0..85d2910d8a8 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -39,6 +39,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/collate/compare/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/char/wrapped_locale.cc index de4414bdd2c..c4f10d0f293 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -40,6 +40,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/collate/compare/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc index af0b4e35dce..0541f0a160a 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -36,9 +36,9 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); + locale loc_de = locale(ISO_8859(15,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 ccf5efac1c4..cef4f2b82e9 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 @@ -2,9 +2,9 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -30,7 +30,7 @@ #include #include -// Check German "de_DE" locale. +// Check German "de_DE.ISO8859-15" locale. void test02() { using namespace std; @@ -40,9 +40,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); + locale loc_de = locale(ISO_8859(15,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 833abde0c75..7036dfc1c3b 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-02-24 Petur Runolfsson @@ -34,7 +34,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 59b16c728c5..3db0d6d29d1 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 @@ -2,9 +2,9 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/collate/compare/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc index 4444d0d4452..be590af6a0c 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 @@ -2,10 +2,10 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -44,6 +44,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/collate/hash/char/2.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc index b4fabd4de14..91b25044bc4 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -26,7 +26,7 @@ #include #include -// Check German "de_DE" locale. +// Check German "de_DE.ISO8859-15" locale. void test02() { using namespace std; @@ -36,9 +36,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); + locale loc_de = locale(ISO_8859(15,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 3f1eb81802f..7583358394c 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -39,6 +39,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/collate/hash/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/char/wrapped_locale.cc index b62f4c7561c..75ab62005f0 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -40,6 +40,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/collate/hash/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc index 90627c1603e..5d646a5edc7 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 @@ -2,9 +2,9 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -30,7 +30,7 @@ #include #include -// Check German "de_DE" locale. +// Check German "de_DE.ISO8859-15" locale. void test02() { using namespace std; @@ -39,9 +39,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); + locale loc_de = locale(ISO_8859(15,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 59b16c728c5..3db0d6d29d1 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 @@ -2,9 +2,9 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/collate/hash/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc index 4444d0d4452..be590af6a0c 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 @@ -2,10 +2,10 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -44,6 +44,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/collate/transform/char/2.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc index 1f300c49c29..883200e545c 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -35,9 +35,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); + locale loc_de = locale(ISO_8859(15,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 a83ce0647b5..8c7fe852293 100644 --- a/libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-02-24 Petur Runolfsson @@ -33,7 +33,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 379d2c8474d..27b1bacb3ab 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -34,6 +34,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test02); - 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/collate/transform/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/char/wrapped_locale.cc index 93b7c6818b1..6bc03bdcd63 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -35,6 +35,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test02); - 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/collate/transform/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc index ca65039872d..e5d6c4e2c4c 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 @@ -2,9 +2,9 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -39,9 +39,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); + locale loc_de = locale(ISO_8859(15,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 c360190b293..dd274aac447 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-02-24 Petur Runolfsson @@ -33,7 +33,7 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 23742832765..40c86d07465 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 @@ -2,9 +2,9 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -38,6 +38,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test02); - 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/collate/transform/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc index 4fe0e684300..e2cabbb251d 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 @@ -2,10 +2,10 @@ // { dg-xfail-if "" { "*-*-hpux11.23" } { "*" } { "" } } */ // { dg-options "-finput-charset=ISO8859-1" } // { dg-require-iconv "ISO8859-1" } -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -39,6 +39,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test02); - 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/collate_byname/named_equivalence.cc b/libstdc++-v3/testsuite/22_locale/collate_byname/named_equivalence.cc index 559cbea15c7..707902fd9a5 100644 --- a/libstdc++-v3/testsuite/22_locale/collate_byname/named_equivalence.cc +++ b/libstdc++-v3/testsuite/22_locale/collate_byname/named_equivalence.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -34,10 +34,10 @@ void test01() string str; locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); str = loc_de.name(); - locale loc_byname(locale::classic(), new collate_byname("de_DE")); + locale loc_byname(locale::classic(), new collate_byname(ISO_8859(15,de_DE))); str = loc_byname.name(); VERIFY( loc_de != loc_byname ); @@ -45,7 +45,7 @@ void test01() // cache the collate facets const collate& coll_de = use_facet >(loc_de); - // Check German "de_DE" locale. + // Check German "de_DE.ISO8859-15" locale. int i1; int i2; long l1; 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/cons/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/cons/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/is/char/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc index 7809399c904..d35e4328f5a 100644 --- a/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc @@ -1,5 +1,5 @@ // { dg-do run { xfail { ! { *-*-linux* *-*-gnu* } } } } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // Copyright (C) 2000-2015 Free Software Foundation, Inc. // @@ -59,8 +59,8 @@ void test02() v_c[i] = mask_is; } - // "de_DE" - locale loc_de = locale("de_DE"); + // "de_DE.ISO8859-15" + locale loc_de = locale(ISO_8859(15,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 6315acfbb68..53e42ed3af0 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -42,6 +42,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/ctype/is/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/char/wrapped_locale.cc index 2b6df40f61c..d8e54104066 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/ctype/is/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc index 9978fb98217..8c3aeed9c26 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 @@ -1,5 +1,5 @@ // { dg-do run { xfail { ! { *-*-linux* *-*-gnu* } } } } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // Copyright (C) 2000-2015 Free Software Foundation, Inc. // @@ -59,8 +59,8 @@ void test02() v_c[i] = mask_is; } - // "de_DE" - locale loc_de = locale("de_DE"); + // "de_DE.ISO8859-15" + locale loc_de = locale(ISO_8859(15,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 d4f22931887..608bb21baeb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/ctype/is/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/wrapped_locale.cc index 7e8facf9c15..40254ab1f7b 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -38,6 +38,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/ctype/narrow/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_env.cc index d4f22931887..608bb21baeb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/ctype/narrow/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/char/wrapped_locale.cc index 17e070c1c89..d27d9f84e0e 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/ctype/narrow/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_env.cc index d4f22931887..608bb21baeb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/ctype/narrow/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/wrapped_locale.cc index 17e070c1c89..d27d9f84e0e 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/ctype/scan/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/scan/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/scan/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/scan/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/scan/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/to/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/to/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/to/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/to/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/to/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/to/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/widen/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_env.cc index eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/widen/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/widen/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc index 7d2a142aaf8..e88eb1e906c 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US.ISO-8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-03-12 Petur Runolfsson @@ -31,7 +31,7 @@ void test02() using namespace std; bool test __attribute__((unused)) = true; - locale loc = locale("en_US.ISO-8859-1"); + locale loc = locale(ISO_8859(1,en_US)); const ctype& wct = use_facet >(loc); char c = 0xff; 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/ctype/widen/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/facet/2.cc b/libstdc++-v3/testsuite/22_locale/facet/2.cc index 6f8aabf1cee..7772be22e02 100644 --- a/libstdc++-v3/testsuite/22_locale/facet/2.cc +++ b/libstdc++-v3/testsuite/22_locale/facet/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "es_MX" } +// { dg-require-namedlocale "es_MX.ISO8859-1" } // 2000-08-31 Benjamin Kosnik @@ -84,7 +84,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 = locale("es_MX"); + locale loc03 = locale(ISO_8859(1,es_MX)); } } diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc index 9fac2993e84..e91758f7c96 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12352.cc @@ -1,5 +1,5 @@ // { dg-require-namedlocale "" } -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -106,7 +106,7 @@ void test01(int iters) std::locale loc1 = std::locale(""); std::locale loc2(loc1, std::locale::classic(), std::locale::numeric); - std::locale loc3 = std::locale("en_US"); + std::locale loc3 = std::locale(ISO_8859(1,en_US)); std::locale loc4(loc3, std::locale::classic(), std::locale::numeric); } diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc index e42678661b9..dea1c1ae6ad 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-1.cc @@ -1,8 +1,8 @@ // { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-rtems* *-*-darwin* } } // { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } } // { dg-options "-pthreads" { target *-*-solaris* } } -// { 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) 2004-2015 Free Software Foundation, Inc. // @@ -39,7 +39,7 @@ void* thread_main(void*) std::locale loc_c = std::locale::classic(); std::locale loc[max_locales]; for (int j = 0; j < max_locales; ++j) - loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR"); + loc[j] = std::locale(j % 2 ? ISO_8859(1,en_US) : ISO_8859(15,fr_FR)); for (int i = 0; i < max_loop_count; ++i) { diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc index 279c9833450..4c51cb8e0a3 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/12658_thread-2.cc @@ -1,8 +1,8 @@ // { dg-do run { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* *-*-solaris* *-*-cygwin *-*-rtems* *-*-darwin* } } // { dg-options "-pthread" { target *-*-freebsd* *-*-dragonfly* *-*-netbsd* *-*-linux* *-*-gnu* } } // { dg-options "-pthreads" { target *-*-solaris* } } -// { 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) 2004-2015 Free Software Foundation, Inc. // @@ -53,7 +53,7 @@ main() pthread_t tid[max_thread_count]; for (int j = 0; j < max_locales; ++j) - loc[j] = std::locale(j % 2 ? "en_US" : "fr_FR"); + loc[j] = std::locale(j % 2 ? ISO_8859(1,en_US) : ISO_8859(15,fr_FR)); for (int i = 0; i < max_thread_count; i++) pthread_create(&tid[i], 0, thread_main, 0); diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc index 463f147d903..5e90feb5bd3 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2000-09-13 Benjamin Kosnik @@ -87,10 +87,10 @@ void test01() // 3 // explicit locale(const char* std_name) - locale loc06 = locale("fr_FR"); + locale loc06 = locale(ISO_8859(15,fr_FR)); VERIFY( loc06 != loc01 ); VERIFY( loc06 != loc02 ); - VERIFY( loc06.name() == "fr_FR"); + VERIFY( loc06.name() == ISO_8859(15,fr_FR)); locale loc07(""); VERIFY( loc07 != loc02 ); VERIFY( loc07.name() != "" ); @@ -113,7 +113,7 @@ void test01() { // This is the same as 5 only use "C" for loc("C") locale loc09(loc06, "C", locale::ctype); - VERIFY( loc09.name() != "fr_FR" ); + VERIFY( loc09.name() != ISO_8859(15,fr_FR) ); VERIFY( loc09.name() != "C" ); VERIFY( loc09.name() != "*" ); VERIFY( loc09 != loc01 ); @@ -143,11 +143,11 @@ void test01() { VERIFY( false ); } locale loc14(loc06, "C", locale::none); - VERIFY( loc14.name() == "fr_FR" ); + VERIFY( loc14.name() == ISO_8859(15,fr_FR) ); VERIFY( loc14 == loc06 ); locale loc15(loc06, "C", locale::collate ); - VERIFY( loc15.name() != "fr_FR" ); + VERIFY( loc15.name() != ISO_8859(15,fr_FR) ); VERIFY( loc15.name() != "C" ); VERIFY( loc15.name() != "*" ); VERIFY( loc15.name() != loc09.name() ); @@ -161,7 +161,7 @@ void test01() { // This is the exact same as 4, with locale("C") for "C" locale loc09(loc06, loc01, locale::ctype); - VERIFY( loc09.name() != "fr_FR" ); + VERIFY( loc09.name() != ISO_8859(15,fr_FR) ); VERIFY( loc09.name() != "C" ); VERIFY( loc09.name() != "*" ); VERIFY( loc09 != loc01 ); @@ -191,11 +191,11 @@ void test01() { VERIFY( false ); } locale loc14(loc06, loc01, locale::none); - VERIFY( loc14.name() == "fr_FR" ); + VERIFY( loc14.name() == ISO_8859(15,fr_FR) ); VERIFY( loc14 == loc06 ); locale loc15(loc06, loc01, locale::collate); - VERIFY( loc15.name() != "fr_FR" ); + VERIFY( loc15.name() != ISO_8859(15,fr_FR) ); VERIFY( loc15.name() != "C" ); VERIFY( loc15.name() != "*" ); VERIFY( loc15.name() != loc09.name() ); diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/38365.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/38365.cc index dda44d9d16c..9d3faf2f42f 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/38365.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/38365.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // Copyright (C) 2008-2015 Free Software Foundation, Inc. // @@ -29,7 +29,7 @@ void test01() bool test __attribute__((unused)) = true; locale other(locale("C")); - locale one(locale("en_US"), new ctype()); + locale one(locale(ISO_8859(1,en_US)), new ctype()); locale loc(other, one, locale::collate); VERIFY( one.name() == "*" ); diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/38368.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/38368.cc index b9e20b33b3a..2f468eb04e4 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/38368.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/38368.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // Copyright (C) 2008-2015 Free Software Foundation, Inc. // @@ -28,7 +28,7 @@ void test01() using namespace std; bool test __attribute__((unused)) = true; - locale loc(locale("C"), "en_US", locale::collate); + locale loc(locale("C"), ISO_8859(1,en_US), locale::collate); locale loc_copy(loc.name().c_str()); const moneypunct& mpunt = diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc index 064cec2051f..9d7fb34ac21 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "it_IT" } +// { dg-require-namedlocale "it_IT.ISO8859-15" } // 2000-09-13 Benjamin Kosnik @@ -33,10 +33,10 @@ void test03() bool test __attribute__((unused)) = true; #ifdef _GLIBCXX_HAVE_SETENV const char* LC_ALL_orig = getenv("LC_ALL"); - if (!setenv("LC_ALL", "it_IT", 1)) + if (!setenv("LC_ALL", ISO_8859(15,it_IT), 1)) { std::locale loc = std::locale(""); - VERIFY( loc.name() == "it_IT" ); + VERIFY( loc.name() == ISO_8859(15,it_IT) ); setenv("LC_ALL", LC_ALL_orig ? LC_ALL_orig : "", 1); } #endif diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/40184.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/40184.cc index 0977caf99d5..2ec464364a3 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/40184.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/40184.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // Copyright (C) 2009-2015 Free Software Foundation, Inc. // @@ -29,7 +29,7 @@ void test01() using namespace std; bool test __attribute__((unused)) = true; - locale locf(locale("C"), "ja_JP.eucjp", locale::monetary); + locale locf(locale("C"), "ja_JP.eucJP", locale::monetary); const moneypunct& mpf = use_facet >(locf); @@ -40,7 +40,7 @@ void test01() VERIFY( mpf.curr_symbol() == mpf_copy.curr_symbol() ); - locale loct(locale("C"), "ja_JP.eucjp", locale::monetary); + locale loct(locale("C"), "ja_JP.eucJP", locale::monetary); const moneypunct& mpt = use_facet >(loct); diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc index 21d4ed32261..cef8d7e5a39 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2001-01-19 Benjamin Kosnik @@ -36,9 +36,9 @@ test02() // construct a locale object with the specialized facet. locale loc_c = locale::classic(); - locale loc_is = locale("is_IS"); + locale loc_is = locale(ISO_8859(1,is_IS)); locale loc_1(locale::classic(), - new numpunct_byname("is_IS")); + new numpunct_byname(ISO_8859(1,is_IS))); // check names VERIFY( loc_c.name() == name_c ); diff --git a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc index e0243645e0e..623117e8e55 100644 --- a/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc +++ b/libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/14071.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "is_IS" } -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2004-02-09 Petur Runolfsson @@ -32,8 +32,8 @@ void test01() using namespace std; bool test __attribute__((unused)) = true; - const locale loc_is = locale("is_IS"); - const locale loc_en = locale("en_US"); + const locale loc_is = locale(ISO_8859(1,is_IS)); + const locale loc_en = locale(ISO_8859(1,en_US)); const locale loc(loc_is, loc_en, locale::monetary); 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 3676634c947..6ffe72c0edd 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_PH" } -// { dg-require-namedlocale "es_MX" } +// { dg-require-namedlocale "en_PH.ISO8859-1" } +// { dg-require-namedlocale "es_MX.ISO8859-1" } // 2000-09-13 Benjamin Kosnik @@ -32,8 +32,8 @@ void test02() using namespace std; bool test __attribute__((unused)) = true; - const string ph("en_PH"); - const string mx("es_MX"); + const string ph(ISO_8859(1,en_PH)); + const string mx(ISO_8859(1,es_MX)); const char* orig = setlocale(LC_ALL, 0); const char* testph = setlocale(LC_ALL, ph.c_str()); const char* testmx = setlocale(LC_ALL, mx.c_str()); diff --git a/libstdc++-v3/testsuite/22_locale/messages/13631.cc b/libstdc++-v3/testsuite/22_locale/messages/13631.cc index fb93c000f4c..b9856a0a228 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/13631.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/13631.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // Copyright (C) 2014-2015 Free Software Foundation, Inc. // @@ -27,7 +27,7 @@ void test01() // This is defined through CXXFLAGS in scripts/testsuite_flags[.in]. const char* dir = LOCALEDIR; - std::locale l("fr_FR"); + std::locale l(ISO_8859(15,fr_FR)); typedef std::messages messages; @@ -63,7 +63,7 @@ void test02() // This is defined through CXXFLAGS in scripts/testsuite_flags[.in]. const char* dir = LOCALEDIR; - std::locale l("fr_FR"); + std::locale l(ISO_8859(15,fr_FR)); typedef std::messages messages; 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 ff60a1842c7..8cfbaae00ee 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-07-17 Benjamin Kosnik @@ -36,7 +36,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); // cache the messages facets @@ -46,7 +46,7 @@ void test01() // string_type get(catalog, int, int, const string_type& ) const; // void close(catalog) const; - // Check German (de_DE) locale. + // Check German (de_DE.ISO8859-15) locale. catalog cat_de = mssg_de.open("libstdc++", loc_c, dir); string s01 = mssg_de.get(cat_de, 0, 0, "please"); string s02 = mssg_de.get(cat_de, 0, 0, "thank you"); 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 11ced8fb95f..699ca2d8e69 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "fr_FR" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-07-17 Benjamin Kosnik @@ -35,7 +35,7 @@ void test02() const char* dir = LOCALEDIR; // basic construction - locale loc_fr = locale("fr_FR"); + locale loc_fr = locale(ISO_8859(15,fr_FR)); VERIFY( locale::classic() != loc_fr ); // cache the messages facets 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 8ed0a7a81fc..889e3857814 100644 --- a/libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/messages/members/char/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" } // 2001-07-17 Benjamin Kosnik @@ -37,8 +37,8 @@ void test03() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_fr = locale("fr_FR"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_fr = locale(ISO_8859(15,fr_FR)); VERIFY( loc_c != loc_us ); VERIFY( loc_us != loc_fr ); 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 77a4ffe0453..97513fa42b5 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/messages/members/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/messages/members/char/wrapped_locale.cc index 8dd71b5982c..26fb30241fa 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "fr_FR" } -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -45,6 +45,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/messages_byname/named_equivalence.cc b/libstdc++-v3/testsuite/22_locale/messages_byname/named_equivalence.cc index b30ee772d84..4229caef164 100644 --- a/libstdc++-v3/testsuite/22_locale/messages_byname/named_equivalence.cc +++ b/libstdc++-v3/testsuite/22_locale/messages_byname/named_equivalence.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-07-17 Benjamin Kosnik @@ -36,10 +36,10 @@ void test01() const char* dir = LOCALEDIR; locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); str = loc_de.name(); - locale loc_byname(locale::classic(), new messages_byname("de_DE")); + locale loc_byname(locale::classic(), new messages_byname(ISO_8859(15,de_DE))); str = loc_byname.name(); VERIFY( loc_de != loc_byname ); @@ -52,7 +52,7 @@ void test01() // string_type get(catalog, int, int, const string_type& ) const; // void close(catalog) const; - // Check German (de_DE) locale. + // Check German (de_DE.ISO8859-15) locale. catalog cat_de = mssg_de.open("libstdc++", loc_c, dir); string s01 = mssg_de.get(cat_de, 0, 0, "please"); string s02 = mssg_de.get(cat_de, 0, 0, "thank you"); 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 2513d7d789c..e9de263632d 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-12 Benjamin Kosnik @@ -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_get/get/char/10.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/10.cc index f484576a47c..bf5e8aaa9d9 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/10.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/10.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-10-23 Paolo Carlini @@ -32,7 +32,7 @@ void test01() bool test __attribute__((unused)) = true; - locale loc_us = locale("en_US"); + locale loc_us = locale(ISO_8859(1,en_US)); iterator_type end; istringstream iss; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/11.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/11.cc index a5fdb418e3a..f3d340b6f76 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/11.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/11.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-10-24 Paolo Carlini @@ -34,7 +34,7 @@ void test01() bool test __attribute__((unused)) = true; // basic construction - locale loc_de = locale("de_DE@euro"); + locale loc_de = locale(ISO_8859(15,de_DE)); iterator_type end; istringstream iss; 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 187158259c1..5c21de57430 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -30,7 +30,7 @@ void test01() bool test __attribute__((unused)) = true; - locale loc_us = locale("en_US"); + locale loc_us = locale(ISO_8859(1,en_US)); iterator_type end; istringstream iss; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc index c39bcb5b5d2..cdf0505e194 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/12.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2004-02-05 Paolo Carlini @@ -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 ); // total EPA budget FY 2002 diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc index a12970edd58..f5f4fd9ec0f 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/13.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2004-02-05 Paolo Carlini @@ -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 ); iterator_type end01, end02; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/15.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/15.cc index 3684694c626..9978694c117 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/15.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/15.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2004-03-01 Paolo Carlini @@ -36,7 +36,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 ); iterator_type end01, end02; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc index 9f4c3482792..0278cba8ae2 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/16.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE@euro" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2004-03-02 Paolo Carlini @@ -36,8 +36,8 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE@euro"); - locale loc_hk = locale("en_HK"); + locale loc_de = locale(ISO_8859(15,de_DE)); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_hk != loc_de ); VERIFY( loc_c != loc_hk ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/17.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/17.cc index af88c50c4b4..6a30990a43a 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/17.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/17.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2004-03-08 Paolo Carlini @@ -36,7 +36,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 ); iterator_type end, end02; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc index 7d4066d9c71..a66705831e6 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/char/18.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2004-03-15 Paolo Carlini @@ -36,7 +36,7 @@ void test01() // 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 ); iterator_type end, end01, end02; 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 3d384fd5d5e..a18dbd3b07e 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-12 Benjamin Kosnik @@ -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 ); // total EPA budget FY 2002 @@ -80,7 +80,7 @@ void test02() VERIFY( result11 == digits4 ); VERIFY( err11 == ios_base::eofbit ); - // for the "en_HK" locale the parsing of the very same input streams must + // for the "en_HK.ISO8859-1" locale the parsing of the very same input streams must // be successful without showbase too, since the symbol field appears in // the first positions in the format and the symbol, when present, must be // consumed. 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 c2cbda993b3..86b84a387f1 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-12 Benjamin Kosnik @@ -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 ); // total EPA budget FY 2002 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 2db1a091fcc..cc84f2eb04a 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-12 Benjamin Kosnik @@ -35,7 +35,7 @@ void test04() // 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 ); // input less than frac_digits 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 dce4cb05c91..9e2c2381841 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 @@ -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 @@ -69,6 +69,6 @@ int main() two.push_back(&test06); two.push_back(&test07); two.push_back(&test08); - 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_get/get/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/wrapped_locale.cc index c6a60547395..8b93bc0c1ab 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 @@ -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 @@ -69,6 +69,6 @@ int main() two.push_back(&test06); two.push_back(&test07); two.push_back(&test08); - 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_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc index 8500817fb46..eb9eb2c5aa0 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-12 Benjamin Kosnik @@ -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_get/get/wchar_t/10.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/10.cc index f827d3835e6..bc993bdfe74 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/10.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/10.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2003-10-23 Paolo Carlini @@ -32,7 +32,7 @@ void test01() bool test __attribute__((unused)) = true; - locale loc_us = locale("en_US"); + locale loc_us = locale(ISO_8859(1,en_US)); iterator_type end; wistringstream iss; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11.cc index eba0990ee86..57da1532668 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/11.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-10-24 Paolo Carlini @@ -34,7 +34,7 @@ void test01() bool test __attribute__((unused)) = true; // basic construction - locale loc_de = locale("de_DE@euro"); + locale loc_de = locale(ISO_8859(15,de_DE)); iterator_type end; wistringstream iss; 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 bd9a5906285..e57ddf349ec 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // Copyright (C) 2003-2015 Free Software Foundation, Inc. // @@ -30,7 +30,7 @@ void test01() bool test __attribute__((unused)) = true; - locale loc_us = locale("en_US"); + locale loc_us = locale(ISO_8859(1,en_US)); iterator_type end; wistringstream iss; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc index 87348cf77ab..0fdbd995a74 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/12.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2004-02-05 Paolo Carlini @@ -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 ); // total EPA budget FY 2002 diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc index d2cdba0a2a3..546e50a8f97 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/13.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2004-02-05 Paolo Carlini @@ -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 ); iterator_type end01, end02; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/15.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/15.cc index fd5e7257e08..9e72ed81deb 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/15.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/15.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2004-03-01 Paolo Carlini @@ -36,7 +36,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 ); iterator_type end01, end02; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc index 0d0077f8cdc..833e8277036 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/16.cc @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE@euro" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2004-03-02 Paolo Carlini @@ -36,8 +36,8 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE@euro"); - locale loc_hk = locale("en_HK"); + locale loc_de = locale(ISO_8859(15,de_DE)); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_hk != loc_de ); VERIFY( loc_c != loc_hk ); diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/17.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/17.cc index 2c6e86fab71..d688f818ce6 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/17.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/17.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2004-03-08 Paolo Carlini @@ -36,7 +36,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 ); iterator_type end, end02; diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc index 936b5937f32..a357f7f943e 100644 --- a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc +++ b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/18.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2004-03-15 Paolo Carlini @@ -36,7 +36,7 @@ void test01() // 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 ); iterator_type end, end01, end02; 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 079d07617a7..0cafe2aee3f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-12 Benjamin Kosnik @@ -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 ); // total EPA budget FY 2002 @@ -80,7 +80,7 @@ void test02() VERIFY( result11 == digits4 ); VERIFY( err11 == ios_base::eofbit ); - // for the "en_HK" locale the parsing of the very same input streams must + // for the "en_HK.ISO8859-1" locale the parsing of the very same input streams must // be successful without showbase too, since the symbol field appears in // the first positions in the format and the symbol, when present, must be // consumed. 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 969f108e752..b67fafef17e 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-12 Benjamin Kosnik @@ -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 ); // total EPA budget FY 2002 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 6170e5c8c96..e0d5674d8c1 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-12 Benjamin Kosnik @@ -35,7 +35,7 @@ void test04() // 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 ); // input less than frac_digits 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 dce4cb05c91..9e2c2381841 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 @@ -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 @@ -69,6 +69,6 @@ int main() two.push_back(&test06); two.push_back(&test07); two.push_back(&test08); - 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_get/get/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/wrapped_locale.cc index c6a60547395..8b93bc0c1ab 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 @@ -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 @@ -69,6 +69,6 @@ int main() two.push_back(&test06); two.push_back(&test07); two.push_back(&test08); - 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/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 @@ -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 @@ -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 @@ -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& mp = use_facet >(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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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/moneypunct/40712.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/40712.cc index eb3c0b5069e..f0ff60ab0be 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/40712.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/40712.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_US" } +// { dg-require-namedlocale "en_US.ISO8859-1" } // 2009-07-18 Paolo Carlini @@ -22,6 +22,7 @@ // 22.2.6.3 Template class moneypunct #include +#include // libstdc++/40712 void test01() @@ -29,7 +30,7 @@ void test01() bool test __attribute__((unused)) = true; using namespace std; - locale loc(locale("C"), "en_US", locale::monetary); + locale loc(locale("C"), ISO_8859(1,en_US), locale::monetary); use_facet >(loc).grouping(); } 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 2f486cea505..abfd7e4fe62 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-23 Benjamin Kosnik @@ -35,7 +35,7 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 d4f22931887..608bb21baeb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/moneypunct/members/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/char/wrapped_locale.cc index 5d2fb2e9bc6..fe62c903888 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -38,6 +38,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/moneypunct/members/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/2.cc index 028a8157544..a8c277fc841 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-23 Benjamin Kosnik @@ -35,7 +35,7 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 d4f22931887..608bb21baeb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/moneypunct/members/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/wrapped_locale.cc index 7e8facf9c15..40254ab1f7b 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -38,6 +38,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/moneypunct_byname/named_equivalence.cc b/libstdc++-v3/testsuite/22_locale/moneypunct_byname/named_equivalence.cc index 11b324bc2b0..a3d91094ba1 100644 --- a/libstdc++-v3/testsuite/22_locale/moneypunct_byname/named_equivalence.cc +++ b/libstdc++-v3/testsuite/22_locale/moneypunct_byname/named_equivalence.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-24 Benjamin Kosnik @@ -33,10 +33,10 @@ void test01() bool test __attribute__((unused)) = true; string str; - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); str = loc_de.name(); - locale loc_byname(locale::classic(), new moneypunct_byname("de_DE")); + locale loc_byname(locale::classic(), new moneypunct_byname(ISO_8859(15,de_DE))); str = loc_byname.name(); locale loc_c = locale::classic(); 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 99faa87ccb1..9685a6f3f8c 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + 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/num_get/get/char/3.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc index 48ea5dce4a6..b51cf699d28 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-11-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test03() // 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/num_get/get/char/5.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/5.cc index 13fb837a1b4..14c54961b56 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-21 Benjamin Kosnik @@ -37,7 +37,7 @@ void test05() istringstream iss; // A locale that expects grouping - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 d1af38cd60d..06a25464edb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test06() double d = 0.0; istringstream iss; - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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/9.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/9.cc index 058b562b1c7..16c914a1b99 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/char/9.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/char/9.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-12-19 Paolo Carlini @@ -33,7 +33,7 @@ void test01() bool test __attribute__((unused)) = true; // A locale that expects grouping - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); istringstream iss; iss.imbue(loc_de); 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 fa4f92469cf..c864049e583 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -58,6 +58,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/num_get/get/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/char/wrapped_locale.cc index c488ecc9619..eacfcbcd46d 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -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/num_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc index 6d3c9cd2e31..a4f35e749a3 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + 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/num_get/get/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc index d0776dcda09..d599347ddab 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-11-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test03() // 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/num_get/get/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc index cc4aae193df..ed78cc32c87 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-21 Benjamin Kosnik @@ -37,7 +37,7 @@ void test05() wistringstream iss; // A locale that expects grouping - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 8e0dc5b171d..e3e06c9b305 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test06() double d = 0.0; wistringstream iss; - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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/9.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/9.cc index 953f3ec83cd..f18c67cea6d 100644 --- a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/9.cc +++ b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/9.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2003-12-19 Paolo Carlini @@ -33,7 +33,7 @@ void test01() bool test __attribute__((unused)) = true; // A locale that expects grouping - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); wistringstream iss; iss.imbue(loc_de); 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 fa4f92469cf..c864049e583 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -58,6 +58,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/num_get/get/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/wrapped_locale.cc index c488ecc9619..eacfcbcd46d 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -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/num_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc index a1aa072a636..8d448d9cfda 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-19 Benjamin Kosnik @@ -34,7 +34,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); // cache the numpunct facets diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc index 65a886a5d1e..aa03a60e6cc 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/20909.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2005-04-08 Paolo Carlini @@ -32,7 +32,7 @@ void test01() bool test __attribute__((unused)) = true; // A locale that expects grouping. - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); const string empty; string result; diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/20914.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/20914.cc index 0b617d760f8..7aa2c0c6291 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/20914.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/20914.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2005-04-17 Paolo Carlini @@ -32,7 +32,7 @@ void test01() bool test __attribute__((unused)) = true; // A locale that expects grouping. - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); const string empty; string result; 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 781e3745dd2..ce6afd4fefe 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-11-19 Benjamin Kosnik @@ -34,7 +34,7 @@ void test03() // 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/num_put/put/char/5.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/5.cc index d3b6e8d11a4..bada771c2ee 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-19 Benjamin Kosnik @@ -34,7 +34,7 @@ void test05() bool test __attribute__((unused)) = true; // A locale that expects grouping. - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); const string empty; string result; diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc index 8fa28607fc0..0b8d14af2ce 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/char/9780-2.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. // @@ -24,7 +24,7 @@ // Make sure that formatted output uses the locale in the output stream. using namespace std; -locale l1 = locale("de_DE"); +locale l1 = locale(ISO_8859(15,de_DE)); const num_put& np = use_facet >(l1); const numpunct& npunct = use_facet >(l1); @@ -51,7 +51,7 @@ void test02() { bool test __attribute__((unused)) = true; - locale l2 = locale("es_ES"); + locale l2 = locale(ISO_8859(15,es_ES)); const numpunct& npunct3 = use_facet >(l2); char c __attribute__((unused)) = npunct3.thousands_sep(); string s = npunct3.grouping(); 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 d8d6cc66ca7..d5ea3a54794 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "es_ES" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -54,6 +54,6 @@ int main() two.push_back(&test03); two.push_back(&test04); two.push_back(&test05); - 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/num_put/put/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/wrapped_locale.cc index e43cb6017be..69b9dc317d8 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "es_ES" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -55,6 +55,6 @@ int main() two.push_back(&test03); two.push_back(&test04); two.push_back(&test05); - 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/num_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc index 6d514079e79..116044b1eb9 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-19 Benjamin Kosnik @@ -34,7 +34,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); // cache the numpunct facets diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc index 5923860f066..8cca878d0fd 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20909.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2005-04-08 Paolo Carlini @@ -32,7 +32,7 @@ void test01() bool test __attribute__((unused)) = true; // A locale that expects grouping. - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); const wstring empty; wstring result; diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20914.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20914.cc index cdffd52b65f..ab92f031d3d 100644 --- a/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20914.cc +++ b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/20914.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2005-04-17 Paolo Carlini @@ -32,7 +32,7 @@ void test01() bool test __attribute__((unused)) = true; // A locale that expects grouping. - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); const wstring empty; wstring result; 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 4180382fe2f..d2c5be454f6 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-11-19 Benjamin Kosnik @@ -34,7 +34,7 @@ void test03() // 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/num_put/put/wchar_t/5.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/5.cc index beaa319a55e..f2efb162347 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-11-19 Benjamin Kosnik @@ -34,7 +34,7 @@ void test05() bool test __attribute__((unused)) = true; // A locale that expects grouping. - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,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 e372f2a0464..4856dea8eed 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -53,6 +53,6 @@ int main() two.push_back(&test03); two.push_back(&test04); two.push_back(&test05); - 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/num_put/put/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/wrapped_locale.cc index ce69346738d..17bb2a31b5e 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -54,6 +54,6 @@ int main() two.push_back(&test03); two.push_back(&test04); two.push_back(&test05); - 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/numpunct/members/char/2.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc index e9c13cf1949..ce3ce0b2f80 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-01-17 Benjamin Kosnik @@ -34,9 +34,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_is = locale("is_IS"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_is = locale(ISO_8859(1,is_IS)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_is ); VERIFY( loc_us != loc_de ); diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc index 8de6dda3e18..18075a58764 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/3.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "it_IT" } +// { dg-require-namedlocale "it_IT.ISO8859-15" } // 2001-01-24 Benjamin Kosnik @@ -30,7 +30,7 @@ void test02() bool test __attribute__((unused)) = true; - locale loc_it = locale("it_IT"); + locale loc_it = locale(ISO_8859(15,it_IT)); const numpunct& nump_it = use_facet >(loc_it); 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 ab24f85624d..e92737be777 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -39,6 +39,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/numpunct/members/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/char/wrapped_locale.cc index 5cfd13410d4..996b4452a6c 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -40,6 +40,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/numpunct/members/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc index 72d84a9b578..352d7a92bd6 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-01-17 Benjamin Kosnik @@ -34,9 +34,9 @@ void test02() // basic construction locale loc_c = locale::classic(); - locale loc_us = locale("en_US"); - locale loc_is = locale("is_IS"); - locale loc_de = locale("de_DE"); + locale loc_us = locale(ISO_8859(1,en_US)); + locale loc_is = locale(ISO_8859(1,is_IS)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_c != loc_de ); VERIFY( loc_us != loc_is ); 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 ab24f85624d..e92737be777 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -39,6 +39,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/numpunct/members/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/wrapped_locale.cc index 5cfd13410d4..996b4452a6c 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_US" } -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "ja_JP.eucJP" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_US.ISO8859-1" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -40,6 +40,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test02); - 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/numpunct_byname/named_equivalence.cc b/libstdc++-v3/testsuite/22_locale/numpunct_byname/named_equivalence.cc index 0d13315e1d4..8cc768a0c6b 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct_byname/named_equivalence.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct_byname/named_equivalence.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-01-24 Benjamin Kosnik @@ -31,10 +31,10 @@ void test01() bool test __attribute__((unused)) = true; string str; - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); str = loc_de.name(); - locale loc_byname(locale::classic(), new numpunct_byname("de_DE")); + locale loc_byname(locale::classic(), new numpunct_byname(ISO_8859(15,de_DE))); str = loc_byname.name(); locale loc_c = locale::classic(); 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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/time_get/date_order/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/date_order/char/wrapped_locale.cc index b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/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 eddb670b8b9..0e4b03b732f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/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 b899fafbe90..43e2381d2cb 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -32,6 +32,6 @@ int main() using namespace __gnu_test; func_callback two; two.push_back(&test01); - 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/time_get/get/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc index 1ea933df0e9..3e351b4df98 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get/char/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get/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 @@ -41,7 +41,7 @@ void test02() 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; diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc index 1f1582e5a34..89f26c45b18 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get/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 @@ -41,7 +41,7 @@ void test02() 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; diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc index b95610ab03e..d2cf27432aa 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/12750.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2003-10-27 Paolo Carlini @@ -34,7 +34,7 @@ void test01() bool test __attribute__((unused)) = true; // basic construction - locale loc_is = locale("is_IS"); + locale loc_is = locale(ISO_8859(1,is_IS)); // create an ostream-derived object, cache the time_get facet iterator_type end; 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 366610687b0..4f77123794b 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik @@ -35,8 +35,8 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); - locale loc_de = locale("de_DE"); + locale loc_hk = locale(ISO_8859(1,en_HK)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_de ); @@ -63,7 +63,7 @@ void test02() iterator_type is_it01(iss); errorstate = good; - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.imbue(loc_de); iss.str("04.04.1971"); iterator_type is_it10(iss); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc index a46b94b916e..52b74bc66b6 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/26701.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_GB" } +// { dg-require-namedlocale "en_GB.ISO8859-1" } // 2010-01-06 Paolo Carlini @@ -33,7 +33,7 @@ void test01() typedef istreambuf_iterator iterator_type; - locale loc_en = locale("en_GB"); + locale loc_en = locale(ISO_8859(1,en_GB)); tm tm0 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0); 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 e7a40edc897..3f3ec38f0f3 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_date/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/char/wrapped_locale.cc index 0853219a1d9..742a5b9339c 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_date/wchar_t/12750.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc index 65eec12b5a4..7a6ad65d51e 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/12750.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "is_IS" } +// { dg-require-namedlocale "is_IS.ISO8859-1" } // 2003-10-27 Paolo Carlini @@ -34,7 +34,7 @@ void test01() bool test __attribute__((unused)) = true; // basic construction - locale loc_is = locale("is_IS"); + locale loc_is = locale(ISO_8859(1,is_IS)); // create an ostream-derived object, cache the time_get facet iterator_type end; 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 aa3df0058d0..0bbd1ce864c 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik @@ -35,8 +35,8 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); - locale loc_de = locale("de_DE"); + locale loc_hk = locale(ISO_8859(1,en_HK)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_de ); @@ -63,7 +63,7 @@ void test02() iterator_type is_it01(iss); errorstate = good; - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.imbue(loc_de); iss.str(L"04.04.1971"); iterator_type is_it10(iss); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc index b15305e50df..4ea1d71a2cb 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/26701.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_GB" } +// { dg-require-namedlocale "en_GB.ISO8859-1" } // 2010-01-06 Paolo Carlini @@ -33,7 +33,7 @@ void test01() typedef istreambuf_iterator iterator_type; - locale loc_en = locale("en_GB"); + locale loc_en = locale(ISO_8859(1,en_GB)); tm tm0 = __gnu_test::test_tm(0, 0, 0, 0, 0, 0, 0, 0, 0); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc index 25e79732435..a177ba78750 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_date/wchar_t/4.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "zh_TW" } +// { dg-require-namedlocale "zh_TW.UTF-8" } // 2003-12-17 Paolo Carlini @@ -32,7 +32,7 @@ void test01() typedef istreambuf_iterator iterator_type; - locale loc_tw = locale("zh_TW"); + locale loc_tw = locale("zh_TW.UTF-8"); iterator_type end; 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 e7a40edc897..3f3ec38f0f3 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/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 0853219a1d9..742a5b9339c 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_monthname/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/2.cc index 158047299ac..7ceb6c46784 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik @@ -35,8 +35,8 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); - locale loc_de = locale("de_DE"); + locale loc_hk = locale(ISO_8859(1,en_HK)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_de ); @@ -54,7 +54,7 @@ void test02() iss.imbue(loc_de); const time_get& tim_get = use_facet >(iss.getloc()); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.str("April"); iterator_type is_it10(iss); tm time10; 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 e7a40edc897..3f3ec38f0f3 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_monthname/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/char/wrapped_locale.cc index 0853219a1d9..742a5b9339c 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_monthname/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc index b97f66c59d9..d3a92cb7059 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik @@ -35,8 +35,8 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); - locale loc_de = locale("de_DE"); + locale loc_hk = locale(ISO_8859(1,en_HK)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_de ); @@ -54,7 +54,7 @@ void test02() iss.imbue(loc_de); const time_get& tim_get = use_facet >(iss.getloc()); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.str(L"April"); iterator_type is_it10(iss); tm time10; 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 e7a40edc897..3f3ec38f0f3 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/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 0853219a1d9..742a5b9339c 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_time/char/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/1.cc index 3445a9a371d..027492a910f 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_de != loc_c ); const string empty; @@ -94,7 +94,7 @@ void test01() VERIFY( *ret04 == 'a' ); VERIFY( errorstate == ios_base::failbit ); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.imbue(loc_de); iss.str("12:00:00"); iterator_type is_it10(iss); 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 8f946587921..75d7e4a34a1 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test02() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_hk != loc_c ); const string empty; 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 e7a40edc897..3f3ec38f0f3 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_time/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/char/wrapped_locale.cc index 0853219a1d9..742a5b9339c 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_time/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_time/wchar_t/1.cc index 0f5c4d9f1cf..1415e3d829e 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test01() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_de != loc_c ); const wstring empty; @@ -94,7 +94,7 @@ void test01() VERIFY( *ret04 == L'a' ); VERIFY( errorstate == ios_base::failbit ); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.imbue(loc_de); iss.str(L"12:00:00"); iterator_type is_it10(iss); 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 7d3f6d554fc..f32067d76d7 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-21 Benjamin Kosnik @@ -34,7 +34,7 @@ void test02() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_hk != loc_c ); const wstring empty; 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 e7a40edc897..3f3ec38f0f3 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/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 0853219a1d9..742a5b9339c 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_weekday/char/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/2.cc index 3a936d06173..47076ea2ce1 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik @@ -35,8 +35,8 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); - locale loc_de = locale("de_DE"); + locale loc_hk = locale(ISO_8859(1,en_HK)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_de ); @@ -54,7 +54,7 @@ void test02() // create "C" time objects const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.imbue(loc_de); iss.str("Sonntag"); iterator_type is_it10(iss); diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc index 5ae798d73cc..27b5da8575f 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-1.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ru_RU.ISO-8859-5" } +// { dg-require-namedlocale "ru_RU.ISO8859-5" } // Copyright (C) 2010-2015 Free Software Foundation, Inc. // @@ -33,7 +33,7 @@ void test01() typedef istreambuf_iterator iterator_type; // basic construction - locale loc("ru_RU.ISO-8859-5"); + locale loc(ISO_8859(5,ru_RU)); // create an ostream-derived object, cache the time_get facet iterator_type end; diff --git a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc index 79b280bfa7a..5a8bc480914 100644 --- a/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc +++ b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/38081-2.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ru_RU.UTF8" } +// { dg-require-namedlocale "ru_RU.UTF-8" } // 2010-01-05 Paolo Carlini @@ -34,7 +34,7 @@ void test01() typedef istreambuf_iterator iterator_type; // basic construction - locale loc("ru_RU.UTF8"); + locale loc("ru_RU.UTF-8"); // create an ostream-derived object, cache the time_get facet iterator_type end; 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 e7a40edc897..3f3ec38f0f3 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_weekday/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/char/wrapped_locale.cc index 0853219a1d9..742a5b9339c 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } -// { dg-require-namedlocale "de_DE" } -// { 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 @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_weekday/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc index 47102a3e521..d557c18eb9a 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-21 Benjamin Kosnik @@ -35,8 +35,8 @@ void test02() // basic construction and sanity checks. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); - locale loc_de = locale("de_DE"); + locale loc_hk = locale(ISO_8859(1,en_HK)); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_hk != loc_c ); VERIFY( loc_hk != loc_de ); @@ -54,7 +54,7 @@ void test02() // create "C" time objects const tm time_bday = __gnu_test::test_tm(0, 0, 12, 4, 3, 71, 0, 93, 0); - // inspection of named locales, de_DE + // inspection of named locales, de_DE.ISO8859-15 iss.imbue(loc_de); iss.str(L"Sonntag"); iterator_type is_it10(iss); 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 e1789beda11..5102a79dd14 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 @@ -1,5 +1,5 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -43,6 +43,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/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 691253d2235..896d5982db2 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 @@ -1,6 +1,6 @@ -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -44,6 +44,6 @@ int main() two.push_back(&test01); two.push_back(&test02); two.push_back(&test03); - 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/time_get/get_year/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_env.cc index 85cb3de61eb..4fe83399ec1 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test03); - 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/time_get/get_year/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_get/get_year/char/wrapped_locale.cc index d7b5b1886d9..57e2bc85026 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test03); - 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/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 85cb3de61eb..4fe83399ec1 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test03); - 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/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 d7b5b1886d9..57e2bc85026 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -37,6 +37,6 @@ int main() func_callback two; two.push_back(&test01); two.push_back(&test03); - 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/time_put/put/char/17038.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc index 84523248dca..f9a2557df33 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/17038.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ta_IN" } +// { dg-require-namedlocale "ta_IN.UTF-8" } // 2004-08-25 Paolo Carlini @@ -38,7 +38,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_in = locale("ta_IN"); + locale loc_in = locale("ta_IN.UTF-8"); VERIFY( loc_in != loc_c ); // create an ostream-derived object, cache the time_put facet @@ -51,7 +51,7 @@ void test01() string result1 = oss.str(); char time_buffer[128]; - setlocale(LC_ALL, "ta_IN"); + setlocale(LC_ALL, "ta_IN.UTF-8"); VERIFY( strftime(time_buffer, 128, "%c", &time1) ); VERIFY( result1 == time_buffer ); 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 42aa63590d5..c120be5ec47 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-17 Benjamin Kosnik @@ -37,7 +37,7 @@ void test02() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_de != loc_c ); // create an ostream-derived object, cache the time_put facet 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 3aa6f68dcd4..ff567f271a6 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-17 Benjamin Kosnik @@ -37,7 +37,7 @@ void test03() // basic construction and sanity check. locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_hk != loc_c ); // create an ostream-derived object, cache the time_put facet 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 82b8cc6b22a..5fe87460b88 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "es_ES" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } // 2001-09-17 Benjamin Kosnik @@ -37,7 +37,7 @@ void test04() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_es = locale("es_ES"); + locale loc_es = locale(ISO_8859(15,es_ES)); VERIFY( loc_es != loc_c ); // create an ostream-derived object, cache the time_put facet 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 704610d3435..b2d308d61d4 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-17 Benjamin Kosnik @@ -40,7 +40,7 @@ void test06() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_de != loc_c ); // create an ostream-derived object, cache the time_put facet 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 1a1775634cb..77e1a5fc217 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-17 Benjamin Kosnik @@ -40,7 +40,7 @@ void test07() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_hk != loc_c ); // create an ostream-derived object, cache the time_put facet 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 840b504d7a9..ea86b4aba34 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "fr_FR@euro" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-09-17 Benjamin Kosnik @@ -40,7 +40,7 @@ void test08() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_fr = locale("fr_FR@euro"); + locale loc_fr = locale(ISO_8859(15,fr_FR)); VERIFY( loc_fr != loc_c ); // create an ostream-derived object, cache the time_put facet diff --git a/libstdc++-v3/testsuite/22_locale/time_put/put/char/9780-1.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/9780-1.cc index 012244c18eb..4e5a2944a28 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/char/9780-1.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/char/9780-1.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 time_put &tp = use_facet >(l1); ostringstream oss; @@ -104,7 +104,7 @@ The problems with the first approach, as above, are numerous. /* With GCC/libstdc++, the output of the program with the arguments -of de_DE es_ES is: +of de_DE.ISO8859-15 es_ES is: domingo lunes martes 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 cedfadd82bb..e3ddf588714 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "es_ES" } -// { dg-require-namedlocale "fr_FR@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -80,6 +80,6 @@ int main() two.push_back(&test08); two.push_back(&test09); two.push_back(&test10); - 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/time_put/put/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/char/wrapped_locale.cc index af9583365ec..0ee4db510ce 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "es_ES" } -// { dg-require-namedlocale "fr_FR@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -80,6 +80,6 @@ int main() two.push_back(&test08); two.push_back(&test09); two.push_back(&test10); - 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/time_put/put/wchar_t/17038.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc index 2b2cd531a41..2580b4c5961 100644 --- a/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc +++ b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/17038.cc @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "ta_IN" } +// { dg-require-namedlocale "ta_IN.UTF-8" } // 2004-08-25 Paolo Carlini @@ -38,7 +38,7 @@ void test01() // basic construction locale loc_c = locale::classic(); - locale loc_in = locale("ta_IN"); + locale loc_in = locale("ta_IN.UTF-8"); VERIFY( loc_in != loc_c ); // create an ostream-derived object, cache the time_put facet @@ -51,7 +51,7 @@ void test01() wstring result1 = oss.str(); wchar_t time_buffer[128]; - setlocale(LC_ALL, "ta_IN"); + setlocale(LC_ALL, "ta_IN.UTF-8"); VERIFY( wcsftime(time_buffer, 128, L"%c", &time1) ); VERIFY( result1 == time_buffer ); 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 f2d0bd8f3e2..0605ba419a8 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-17 Benjamin Kosnik @@ -37,7 +37,7 @@ void test02() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_de != loc_c ); // create an ostream-derived object, cache the time_put facet 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 6fa664aa4d1..76eb05346b9 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-17 Benjamin Kosnik @@ -37,7 +37,7 @@ void test03() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_hk != loc_c ); // create an ostream-derived object, cache the time_put facet 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 a6e4b634fd9..11cdf804539 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "es_ES" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } // 2001-09-17 Benjamin Kosnik @@ -37,7 +37,7 @@ void test04() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_es = locale("es_ES"); + locale loc_es = locale(ISO_8859(15,es_ES)); VERIFY( loc_es != loc_c ); // create an ostream-derived object, cache the time_put facet 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 062c218264f..b9629084b8e 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "de_DE" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } // 2001-09-17 Benjamin Kosnik @@ -40,7 +40,7 @@ void test06() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_de = locale("de_DE"); + locale loc_de = locale(ISO_8859(15,de_DE)); VERIFY( loc_de != loc_c ); // create an ostream-derived object, cache the time_put facet 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 eaf49fc44a8..0749172b9af 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "en_HK" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } // 2001-09-17 Benjamin Kosnik @@ -40,7 +40,7 @@ void test07() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_hk = locale("en_HK"); + locale loc_hk = locale(ISO_8859(1,en_HK)); VERIFY( loc_hk != loc_c ); // create an ostream-derived object, cache the time_put facet 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 fad15ee7119..62a4eddfc79 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 @@ -1,4 +1,4 @@ -// { dg-require-namedlocale "fr_FR@euro" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-09-17 Benjamin Kosnik @@ -40,7 +40,7 @@ void test08() // basic construction and sanity check locale loc_c = locale::classic(); - locale loc_fr = locale("fr_FR@euro"); + locale loc_fr = locale(ISO_8859(15,fr_FR)); VERIFY( loc_fr != loc_c ); // create an ostream-derived object, cache the time_put facet 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 cedfadd82bb..e3ddf588714 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 @@ -1,7 +1,7 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "es_ES" } -// { dg-require-namedlocale "fr_FR@euro" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } // 2001-08-15 Benjamin Kosnik @@ -80,6 +80,6 @@ int main() two.push_back(&test08); two.push_back(&test09); two.push_back(&test10); - 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/time_put/put/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/time_put/put/wchar_t/wrapped_locale.cc index bb9170772e7..5695dacad94 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 @@ -1,8 +1,8 @@ -// { dg-require-namedlocale "de_DE" } -// { dg-require-namedlocale "en_HK" } -// { dg-require-namedlocale "es_ES" } -// { dg-require-namedlocale "fr_FR@euro" } -// { dg-require-namedlocale "ja_JP.eucjp" } +// { dg-require-namedlocale "de_DE.ISO8859-15" } +// { dg-require-namedlocale "en_HK.ISO8859-1" } +// { dg-require-namedlocale "es_ES.ISO8859-15" } +// { dg-require-namedlocale "fr_FR.ISO8859-15" } +// { dg-require-namedlocale "ja_JP.eucJP" } // 2001-08-15 Benjamin Kosnik @@ -81,6 +81,6 @@ int main() two.push_back(&test08); two.push_back(&test09); two.push_back(&test10); - run_tests_wrapped_locale("ja_JP.eucjp", two); + run_tests_wrapped_locale("ja_JP.eucJP", two); return 0; } 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -36,7 +36,7 @@ void test01() putc(static_cast(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 // 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 @@ // . // { 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 @@ -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 @@ -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/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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -35,7 +35,7 @@ void test01() putc(static_cast(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) ); diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index 6a62dfd7271..f5528a02e96 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -895,7 +895,7 @@ proc check_v3_target_time { } { proc check_v3_target_namedlocale { args } { global et_namedlocale - global tool + global tool set et_namedlocale 0 @@ -909,24 +909,41 @@ proc check_v3_target_namedlocale { args } { set f [open $src "w"] puts $f "#include " puts $f "#include " - puts $f "using namespace std;" + puts $f "#include " + puts $f "using namespace std;" + puts $f "char *transform_locale(const char *name)" + puts $f "{" + puts $f " char *result = new char\[50\];" + puts $f " strcpy(result, name);" + puts $f "#if defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__" + puts $f " /* fall-through */" + puts $f "#else" + puts $f " if (strstr(result, \"ISO8859-15\")) {" + puts $f " strcat(result, \"@euro\");" + puts $f " }" + puts $f "#endif" + puts $f " return result;" + puts $f "}" puts $f "int main (int argc, char** argv)" puts $f "{" puts $f " if (argc < 2)" puts $f " {" puts $f " printf(\"locale support test not supported\\n\");" puts $f " return 1;" - puts $f " }" - puts $f " try" + puts $f " }" + puts $f " const char *namedloc = transform_locale(*(argv + 1));" + puts $f " try" puts $f " {" - puts $f " locale(*(argv + 1));" + puts $f " locale((const char*)namedloc);" + puts $f " delete namedloc;" puts $f " return 0;" puts $f " }" puts $f " catch(...)" puts $f " {" - puts $f " printf(\"locale '%s' not supported\\n\", *(argv + 1));" + puts $f " printf(\"locale '%s' not supported\\n\", namedloc);" + puts $f " delete namedloc;" puts $f " return 1;" - puts $f " }" + puts $f " }" puts $f "}" close $f diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.h b/libstdc++-v3/testsuite/util/testsuite_hooks.h index d0c8b1d6bfd..0d8afbd2a3f 100644 --- a/libstdc++-v3/testsuite/util/testsuite_hooks.h +++ b/libstdc++-v3/testsuite/util/testsuite_hooks.h @@ -67,6 +67,13 @@ # define unlink(x) #endif +#if defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ +# define ISO_8859(part,langTERR) #langTERR ".ISO8859-" #part +#else +# define ISO_8859(part,langTERR) ((part) == 15 ?\ + #langTERR ".ISO8859-" #part "@euro" : #langTERR ".ISO8859-" #part) +#endif + namespace __gnu_test { // All macros are defined in GLIBCXX_CONFIGURE_TESTSUITE and imported