Improve portability of named locale tests

author redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>

Fri, 13 Nov 2015 15:25:48 +0000 (15:25 +0000)

committer redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>

Fri, 13 Nov 2015 15:25:48 +0000 (15:25 +0000)
author redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 13 Nov 2015 15:25:48 +0000 (15:25 +0000)
committer redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 13 Nov 2015 15:25:48 +0000 (15:25 +0000)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog

index dd86ffb1eb4e5d74bea1d1b2882b7520f2d2b003..4daa0c308a7c7ad4b7b2913237ad5332440dd1c5 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,360 @@
+2015-11-13  John Marino  <gnugcc@marino.st>
+
+       * 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  <jenny.hyphen.fa@gmail.com>
             Jonathan Wakely  <jwakely@redhat.com>
  
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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 37ac8870a9e788ac3dc519383acc1311d7619d31..7fbcd85f5fbe914b4799ad1dabed66867ba2102d 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -27,14 +27,14 @@
  // Required instantiation
  // codecvt<wchar_t, char, mbstate_t>
  //
-// 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<wchar_t, char, mbstate_t>    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<w_codecvt>(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 9f50fc45bfd0ce36220ad0fc054b35459b61c2da..6d737843a148a9ee8bad1022b440416718a72710 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -27,14 +27,14 @@
  // Required instantiation
  // codecvt<wchar_t, char, mbstate_t>
  //
-// 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<wchar_t, char, mbstate_t>    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<w_codecvt>(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 96b15677a253096342e1bdf25b3e7a0ebdef0654..5e21cbb09f722b81ac297db2769d526958e871e1 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -27,19 +27,19 @@
  // Required instantiation
  // codecvt<wchar_t, char, mbstate_t>
  //
-// Test do_encoding with ISO-8859-1 locale.
+// Test do_encoding with ISO8859-1 locale.
  void test02()
  {
    using namespace std;
    typedef codecvt<wchar_t, char, mbstate_t>    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<w_codecvt>(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 b5d1d40c6feb26c409157f7e30eaaa5b6a18b836..a2070f60e403299718608fd408ce0895bd075f57 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -27,19 +27,19 @@
  // Required instantiation
  // codecvt<wchar_t, char, mbstate_t>
  //
-// Test do_encoding with ISO-8859-15 locale.
+// Test do_encoding with ISO8859-1 locale.
  void test03()
  {
    using namespace std;
    typedef codecvt<wchar_t, char, mbstate_t>    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<w_codecvt>(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 a0445adb2afd5f3f12e782633b617f9fb183926c..21d1aed7f08f7eb2b6782164180d06411bc12966 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -41,7 +41,7 @@ zero_state(std::mbstate_t& state)
  // Required instantiation
  // codecvt<wchar_t, char, mbstate_t>
  //
-// 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<w_codecvt>(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 5c4fbb0a68414b127af18b0fe9f508bfb19b3448..d108a431b27d450eb2661e437a6842e0839d8a17 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -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<w_codecvt>(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 ed9aec33859c47c3a329d58b9eb65c74e850404d..e39a6fa33b957fca6fedf7c3a50e5c147ee629b6 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -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<w_codecvt>(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 d0d3831a1ffc962b2d5a95ac934612e4ba940c8c..7b0c286be5d228f9f207561dd74c94c8dfc9df8e 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -32,12 +32,12 @@ void test02()
    bool test __attribute__((unused)) = true;
    typedef codecvt<wchar_t, char, mbstate_t>    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<w_codecvt>(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 269a15d805682b34646da594776f12651d7edbda..3111fc6ad8a470ecca7ee26d0b14df2ec44c93e4 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -32,12 +32,12 @@ void test03()
    bool test __attribute__((unused)) = true;
    typedef codecvt<wchar_t, char, mbstate_t>    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<w_codecvt>(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 9939eb4481b8b361a2564b207d99a1eb336d72a2..f3628b4e31c756f82b38661fb3281cee4d0cd410 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -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<w_codecvt>(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 7027815cda6341c1cbc9d84337afb842ebdd5109..8fad77fc2ad019a29ca9c3a4a426199522eba87a 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -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<w_codecvt>(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 c39e4a59ac9fbd5feea50cceec8c6e33a7ca0426..7c63cb3298e4f603767a4f9f0b299a5b3eac4390 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -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<w_codecvt>(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 5e1a47f22f74cbf04c2d643274f5b64c64234c86..b048854d676eb6239b4e5fa52ed909baae24e43d 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -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<w_codecvt>(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 a728d12050f9f64c20e4819556294687fcf8c214..1c457968729dd0e27a068956fd87458e5efb11d2 100644 (file)
--- 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 <locale>
  #include <ext/pod_char_traits.h>
+#include <testsuite_hooks.h>
  
  #define mychar __gnu_cxx::character<unsigned short, int>
  
@@ -84,7 +85,7 @@ void test01()
    }
    {
      locale loc2(locale::classic(),
-               new codecvt_byname<mychar, char, mbstate_t>("de_DE"));
+               new codecvt_byname<mychar, char, mbstate_t>(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 e13c65e78f6f6c949b68f2b2c0a6696ac9c76eb2..4f55a555d63fbbdff2365e9574d65d088ef9a1c0 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 31e71d5f0500e2d2b2cb0aa031fa52f95f59714a..e48ff8a757438170577ef7070fe839c1dcbe9fc6 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -26,7 +26,7 @@
  #include <locale>
  #include <testsuite_hooks.h>
  
-// 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 066e0c983709110561eb6b712235f8aa1d7b6c51..d18f66bcd4bde6f60f201cc0912c4f0459765f5e 100644 (file)
--- 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 <peturr02@ru.is>
  
@@ -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 39c151f60c080a59ef44d35dee8d21da6b50e724..85d2910d8a896fe1b1238abd91269b293bf930d6 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 de4414bdd2c1d4ee0832cc1e7f76edf9329ed95e..c4f10d0f2936ff58a28fc0e27b4c884dc3c694cf 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 af0b4e35dce0d685c95466774a615e43552cc9ff..0541f0a160afcfbbd98ba462161e0ec6f2b0109a 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 ccf5efac1c4fdab15f0cd9ea01a2366b44671eb9..cef4f2b82e941d1f61a748985668460674e088fa 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -30,7 +30,7 @@
  #include <locale>
  #include <testsuite_hooks.h>
  
-// 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 833abde0c75d9cf0fc6e8f53a23510856d25877f..7036dfc1c3bab662c34c7411c1f42de5dae78bff 100644 (file)
--- 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 <peturr02@ru.is>
  
@@ -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 59b16c728c58ad06a110c5aed9ef262e03c50b65..3db0d6d29d1cd330f75d89592c6a6ec17781b108 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 4444d0d445201fb9fe37549e50eb7fc494d2272d..be590af6a0c108b7341e5fb56c46044002be23aa 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b4fabd4de14d8867a7b693fa41f20d0f70706f68..91b25044bc4686815b68503d80e738fa7438275e 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -26,7 +26,7 @@
  #include <locale>
  #include <testsuite_hooks.h>
  
-// 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 3f1eb81802fc8a7cb2e3e61bbc3793943c0ef32f..7583358394cf1d23cc8606be3f303a783cadfbc9 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b62f4c7561c80d74819e282e87867d5bb665b15d..75ab62005f04dd3c63a6116948ac5ac24358af1c 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 90627c1603e4c5cf7f57bc6bf04208e7b9433233..5d646a5edc71375ef8cc5248ccb73e9ecebfd210 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -30,7 +30,7 @@
  #include <locale>
  #include <testsuite_hooks.h>
  
-// 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 59b16c728c58ad06a110c5aed9ef262e03c50b65..3db0d6d29d1cd330f75d89592c6a6ec17781b108 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 4444d0d445201fb9fe37549e50eb7fc494d2272d..be590af6a0c108b7341e5fb56c46044002be23aa 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 1f300c49c29bdba08ef854435c01d8c4959c91a2..883200e545c441041965f84696cb29c7497091a1 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 a83ce0647b5634d2675975a20279afd7f2882a40..8c7fe852293109b6a8dc8fb903bb99c8f08a6210 100644 (file)
--- 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 <peturr02@ru.is>
  
@@ -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 379d2c8474d301e30258d552b68e834c56f16823..27b1bacb3ab547a25498dac528880af4546cfce9 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 93b7c6818b1c607cfa6a5d8d409f51b22bba7156..6bc03bdcd63d55dd39a43f17d81b06a5cbcc8e14 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 ca65039872d57be0c6ac21ecc2af2887ce457a8c..e5d6c4e2c4c73d8c5713e79587ef40cebd96e886 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 c360190b29306e168f0056569c5682cd88caba26..dd274aac4476dc8a2951af838755a57cdb8cc821 100644 (file)
--- 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 <peturr02@ru.is>
  
@@ -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 23742832765eb08b2dc168dae68d5938b786e480..40c86d07465e12285aca288b10dfb50a2865eedb 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 4fe0e6843009a475d0ffb71dc15d22a0d8d0c0bd..e2cabbb251d4970d92bab22d96192797de360955 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 559cbea15c76b116166676eba3b870e7d23bf9a7..707902fd9a5ea3c14cd344d47dedec0df11b16f8 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char>("de_DE"));
+  locale loc_byname(locale::classic(), new collate_byname<char>(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<char>& coll_de = use_facet<collate<char> >(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 7809399c904029605e7105905cab65ae146095ef..d35e4328f5a7f38ba708f6442f285287f6bfbe11 100644 (file)
--- 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<char>& ctype_de = use_facet<ctype<char> >(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 6315acfbb68920dcc1eae931c33c25056360e365..53e42ed3af0048617a5d100af7079d302aa8dd43 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 2b6df40f61ce6332843acdc53db30ad5a91f9dab..d8e54104066adbd056db40f54017191f24bc5c9e 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 9978fb98217a63c42e72eb7e88f7a6ae04e50042..8c3aeed9c267868a5dfd1922ef17e985f2a7d7da 100644 (file)
--- 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<wchar_t>& ctype_de = use_facet<ctype<wchar_t> >(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 d4f22931887202d4d3088c3682736d770af971b4..608bb21baebfcbbd8edfa9c659b1303f6e2aacd4 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 7e8facf9c15dd802c9c6710e208bbab56cecbc37..40254ab1f7b14c4ff47b9bf0f15315eae1288630 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 d4f22931887202d4d3088c3682736d770af971b4..608bb21baebfcbbd8edfa9c659b1303f6e2aacd4 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 17e070c1c89d40af6d222245bca43d3c5144b556..d27d9f84e0ee277fde39e4ff4a9f0431c1cb81e9 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 d4f22931887202d4d3088c3682736d770af971b4..608bb21baebfcbbd8edfa9c659b1303f6e2aacd4 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 17e070c1c89d40af6d222245bca43d3c5144b556..d27d9f84e0ee277fde39e4ff4a9f0431c1cb81e9 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 7d2a142aaf82d496a475d44235b4ea89febf8acb..e88eb1e906c34dc924bc80efb174d7ec0a208c3a 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -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<wchar_t>& wct = use_facet<ctype<wchar_t> >(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 6f8aabf1ceea4ebc5084e89c8c5fe7a8b7cbaed3..7772be22e0248ca04f6dd49c254336dd616a48e8 100644 (file)
--- 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 <bkoz@redhat.com>
  
@@ -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 9fac2993e841698c959a5ea5d355f46d3e2fc758..e91758f7c96082740ebdea08913ec1c7a69077e9 100644 (file)
--- 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 e42678661b9c4723cde9907b5149c884be4c3749..dea1c1ae6ade38593c3e4c149a06d388cd8f0dcd 100644 (file)
--- 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 279c98334502dad6d9eceb632c76fd138027291d..4c51cb8e0a31204220abf87e03a5369d99c6bcb4 100644 (file)
--- 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 463f147d903791d7da1e765e15d54e1133530454..5e90feb5bd39d43afb3c205781265ba1ae22a4f7 100644 (file)
--- 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 <bkoz@redhat.com>
  
@@ -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 dda44d9d16c3aceeed31aad135fd20354b8fd4f2..9d3faf2f42ff230aa5d037cc32b14c8c0da50e61 100644 (file)
--- 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<char>());
+  locale one(locale(ISO_8859(1,en_US)), new ctype<char>());
    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 b9e20b33b3aab0d32c279e51f1bd4498ee841d82..2f468eb04e42ca2c189ee24aa06ec877d31b47c6 100644 (file)
--- 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<char, true>& mpunt =
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/4.cc

index 064cec2051f13d23a3370a220eba4ead43b1577c..9d7fb34ac219a5d9057455f6ebc287bcf7db679f 100644 (file)
--- 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 <bkoz@redhat.com>
  
@@ -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 0977caf99d5a0a6705659b78ab16abcbf1fbd41f..2ec464364a3f069f116997f39fc0ce928477b140 100644 (file)
--- 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<wchar_t, false>& mpf = 
      use_facet<moneypunct<wchar_t, false> >(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<wchar_t, true>& mpt = 
      use_facet<moneypunct<wchar_t, true> >(loct);
diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/7.cc

index 21d4ed32261ffdf4450d7ea9b022a63915a51319..cef8d7e5a3942fcf662a4a2b2af865158929b0a4 100644 (file)
--- 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 <bkoz@redhat.com>
  
@@ -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<char>("is_IS"));
+                             new numpunct_byname<char>(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 e0243645e0ee6f430de6e4305d4acc7c81f1549f..623117e8e5585ae58c312eb90050b6bf98a276b0 100644 (file)
--- 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  <peturr02@ru.is>
  
@@ -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 3676634c9474a1c486c9d958cfdc8cff6f8788d7..6ffe72c0edd891a579810ef1b24979f51c1c3edd 100644 (file)
--- 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 <bkoz@redhat.com>
  
@@ -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 fb93c000f4c2f4c23878da8b648dbdd41acda2b7..b9856a0a228ec3484bc1e437118b86f053ad594b 100644 (file)
--- 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<char> 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<wchar_t> 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 ff60a1842c73ed46dd3e9d5baf06d90813ea943b..8cfbaae00ee6fcdf9a25f0938f79a5c5ab9df577 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 11ced8fb95f231b98dc6849906dfe8aa15ecc9b1..699ca2d8e690f6283d8b55382826f03e0b1dd11e 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 8ed0a7a81fca8ff7e78889ebf3e8c2a8e7966afe..889e3857814efc8fca8887b3f4e806695c95441f 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 77a4ffe0453321fce9bfbdbcc93ff324d59b3fc0..97513fa42b58f21c676f50194d1c8e31aa989dd8 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 8dd71b5982cb148b59a9fa152ca4b3355fc1150d..26fb30241fa2b3a0eec7254dd79495a4a0ce265d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b30ee772d8465751c1170e34b8c912ad2354c7ae..4229caef16447e0f798e469967b39b3545310c5c 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char>("de_DE"));
+  locale loc_byname(locale::classic(), new messages_byname<char>(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 2513d7d789c3b42db5a2184455389db21296c47e..e9de263632da812ca04db74886e8073db7d8db02 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test01()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE@euro");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    VERIFY( loc_c != loc_de );
  
    // sanity check the data is correct.
diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/char/10.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/char/10.cc

index f484576a47c42d69c764a44d637f03bdb135de3a..bf5e8aaa9d99c75109c86d98fcfc59a97dcfdd25 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 a5fdb418e3aa920ab362568c7ab8e4aad96df2df..f3d340b6f765be000b6d136e512742753527aded 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 187158259c1a2ad931e7c6a4783546de6823891c..5c21de57430812d5e8d972186ec65382f35eb83a 100644 (file)
--- 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 c39bcb5b5d27eb3c017ff6682147e7feb003d6e4..cdf0505e1944c5090007ae53ad38406cc9fcca4b 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 a12970edd58efc49944084decd62e7bf5840aee3..f5f4fd9ec0f2904cdecccfd9bf59dc6a8b62ba56 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 3684694c62602711edc84205445b410e0e279140..9978694c117a6a4cf9fc3144eebd76c078e587b9 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 9f4c3482792b517d7005f96b2f376cb31c3e47f8..0278cba8ae2ebcc86acc4ff9ce112394e491e66e 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 af88c50c4b49071cef3c1e68a85d5a2ce7edadc7..6a30990a43abfe8da6b6a9aea7426f0b95643654 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 7d4066d9c714ba2463e99d9eb9d2402db5ec2e33..a66705831e6eb90bbee572c0dfe006722fadc406 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 3d384fd5d5ee28181cacb5dc5a3c516c493e7189..a18dbd3b07e2d41e200fea5dc056b120da743be2 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test02()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_hk = locale("en_HK");
+  locale loc_hk = locale(ISO_8859(1,en_HK));
    VERIFY( loc_c != loc_hk );
  
    // 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 c2cbda993b3af4c92584bedde84d64b43805aba6..86b84a387f19d818955a09b7eaa8bfdea625e5a6 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test03()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE@euro");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    VERIFY( loc_c != loc_de );
  
    // 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 2db1a091fccb306a9bf65b3ef50b6ef356728a3e..cc84f2eb04a11ce798c47e8704101bc4f6799d50 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 dce4cb05c914b39983d761c3ebefe4316528cb2e..9e2c2381841008e02a38ebc0f54d2c9fa8ef2b80 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 c6a605473958c9b6f8435d9fa926ebe16722014e..8b93bc0c1aba8418b6aebf519e0c054ef5c5203e 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 8500817fb46af85bb034aeedbe542f1f211d4d0b..eb9eb2c5aa07bc5216aebe68900e57a09399e680 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test01()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE@euro");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    VERIFY( loc_c != loc_de );
  
    // sanity check the data is correct.
diff --git a/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/10.cc b/libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/10.cc

index f827d3835e613b33efba8e75b28a42a4060e37f3..bc993bdfe7478bd59e4dfb5689d6abb78a607eb4 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 eba0990ee86747675fff3d7d7f750469a3683a97..57da1532668f211ef6b29f0e3f9d8c1158933f62 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 bd9a59062852dca07e7848c5bec67af9f47a8b6c..e57ddf349ecfe8ca2a90d746fac4de223e1fa30f 100644 (file)
--- 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 87348cf77ab4e2086e64e6a64c5cca42d9087f0a..0fdbd995a74926059b2a7b177b043f19d6aaddd0 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 d2cdba0a2a39afb201803bbe5e30671e66d920dd..546e50a8f97cd5d3fc2c2352814831bd3e7fba90 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 fd5e7257e08072a8df20e79ac16111f260efe243..9e72ed81deb390b1b770616fdb63c50a70337be6 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 0d0077f8cdc7647d9e60f91b8cef91ef7f61f974..833e82770364bd79710634894f86a708dded36c4 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 2c6e86fab718ca9eab272283dc6c5e4571e5ee45..d688f818ce66b120d2a2d5731ab2ce2abbf23172 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 936b5937f32255ec1cac5d260ed2b89a71df3838..a357f7f943ea42532126d7fd602e18d880abb9b5 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 079d07617a76ddabbfd7c1591418cfaf4b60941c..0cafe2aee3f698b088f5c36d09f77c063dff8069 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test02()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_hk = locale("en_HK");
+  locale loc_hk = locale(ISO_8859(1,en_HK));
    VERIFY( loc_c != loc_hk );
  
    // 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 969f108e752112bd2bfad54d7d69783a4dab7bff..b67fafef17e774367dbbb23df4ed0b046dffbb2f 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test03()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE@euro");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    VERIFY( loc_c != loc_de );
  
    // 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 6170e5c8c9623a50bcdb9d2169da6f42d56dc5d3..e0d5674d8c181e65fd309d0f75b29e450b1ca666 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 dce4cb05c914b39983d761c3ebefe4316528cb2e..9e2c2381841008e02a38ebc0f54d2c9fa8ef2b80 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 c6a605473958c9b6f8435d9fa926ebe16722014e..8b93bc0c1aba8418b6aebf519e0c054ef5c5203e 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 62ef407b0cd38005e4111c361a22e86add0fe9a7..8c493e6f6887cc2bbdbe056d20bfa2cb89063091 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test01()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE@euro");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    VERIFY( loc_c != loc_de );
  
    // sanity check the data is correct.
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc

index 8d58abaab400a30bc0493305b85ca8abcb167d7e..40dd26373e32f14cd6ea2a94385d71a90048b0c0 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "en_HK" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
  
  // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test02()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_hk = locale("en_HK");
+  locale loc_hk = locale(ISO_8859(1,en_HK));
    VERIFY( loc_c != loc_hk );
  
    // sanity check the data is correct.
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc

index d15ccc551005dd909dc928250ce41a9df70afa35..386e08bba97d5e7e64a1627fcea0fc625ff85899 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test03()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE@euro");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    VERIFY( loc_c != loc_de );
  
    // sanity check the data is correct.
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc

index 33b5be87ef5e464febcacef127c1b144c9286ad8..dc0396173d3121b57a820d202d2893e25589afa9 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/9780-3.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "de_DE" }
-// { dg-require-namedlocale "es_ES" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-require-namedlocale "es_ES.ISO8859-15" }
  
  // Copyright (C) 2004-2015 Free Software Foundation, Inc.
  //
@@ -27,8 +27,8 @@ int main()
    using namespace std;
  
    bool test __attribute__((unused)) = true;
-  locale l1 = locale("de_DE");
-  locale l2 = locale("es_ES");
+  locale l1 = locale(ISO_8859(15,de_DE));
+  locale l2 = locale(ISO_8859(15,es_ES));
    
    const money_put<char>& mp = use_facet<money_put<char> >(l1);  
    ostringstream oss;
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc

index 6d33c558855da54ec48c408a9e4a98ee383c2d76..6666050d49680a3cb8f341950d481e1eafc7b365 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_env.cc
@@ -1,6 +1,6 @@
-// { dg-require-namedlocale "de_DE" }
-// { dg-require-namedlocale "de_DE@euro" }
-// { dg-require-namedlocale "en_HK" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
  
  // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -59,6 +59,6 @@ int main()
    two.push_back(&test04);
    two.push_back(&test05);
    two.push_back(&test06);
-  run_tests_wrapped_env("de_DE", "LANG", two);
+  run_tests_wrapped_env(ISO_8859(15,de_DE), "LANG", two);
    return 0;
  }
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc

index 7b773998148f484a6701173dc41d3c8804883685..eacfcbcd46d3bfed029e16c5c6cfd175ce6e9ae9 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/char/wrapped_locale.cc
@@ -1,6 +1,6 @@
-// { dg-require-namedlocale "ja_JP.eucjp" }
-// { dg-require-namedlocale "de_DE@euro" }
-// { dg-require-namedlocale "en_HK" }
+// { dg-require-namedlocale "ja_JP.eucJP" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
  
  // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -59,6 +59,6 @@ int main()
    two.push_back(&test04);
    two.push_back(&test05);
    two.push_back(&test06);
-  run_tests_wrapped_locale("ja_JP.eucjp", two);
+  run_tests_wrapped_locale("ja_JP.eucJP", two);
    return 0;
  }
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc

index 1594874ceefcdf56fd6412fce74e09899950b626..35666414293751a4038bf530df0f970ca55d76f6 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test01()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE@euro");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    VERIFY( loc_c != loc_de );
  
    // sanity check the data is correct.
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc

index b75b88b0e14173f0dc38cee54687e3ba0dfbd603..69ce62c5ff559194395a0802d8bbff52d075ec60 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "en_HK" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
  
  // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test02()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_hk = locale("en_HK");
+  locale loc_hk = locale(ISO_8859(1,en_HK));
    VERIFY( loc_c != loc_hk );
  
    // sanity check the data is correct.
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc

index 7c5dec2c28d9c5fb9fc0b59de0ced642fc323870..e54c692be918d2f04bce5830c0195a99c00a9e6c 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2001-08-27 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -35,7 +35,7 @@ void test03()
  
    // basic construction
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE@euro");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    VERIFY( loc_c != loc_de );
  
    // sanity check the data is correct.
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc

index 6d33c558855da54ec48c408a9e4a98ee383c2d76..6666050d49680a3cb8f341950d481e1eafc7b365 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_env.cc
@@ -1,6 +1,6 @@
-// { dg-require-namedlocale "de_DE" }
-// { dg-require-namedlocale "de_DE@euro" }
-// { dg-require-namedlocale "en_HK" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
  
  // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -59,6 +59,6 @@ int main()
    two.push_back(&test04);
    two.push_back(&test05);
    two.push_back(&test06);
-  run_tests_wrapped_env("de_DE", "LANG", two);
+  run_tests_wrapped_env(ISO_8859(15,de_DE), "LANG", two);
    return 0;
  }
diff --git a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc

index 7b773998148f484a6701173dc41d3c8804883685..eacfcbcd46d3bfed029e16c5c6cfd175ce6e9ae9 100644 (file)
--- a/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/wrapped_locale.cc
@@ -1,6 +1,6 @@
-// { dg-require-namedlocale "ja_JP.eucjp" }
-// { dg-require-namedlocale "de_DE@euro" }
-// { dg-require-namedlocale "en_HK" }
+// { dg-require-namedlocale "ja_JP.eucJP" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-require-namedlocale "en_HK.ISO8859-1" }
  
  // 2001-08-15 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -59,6 +59,6 @@ int main()
    two.push_back(&test04);
    two.push_back(&test05);
    two.push_back(&test06);
-  run_tests_wrapped_locale("ja_JP.eucjp", two);
+  run_tests_wrapped_locale("ja_JP.eucJP", two);
    return 0;
  }
diff --git a/libstdc++-v3/testsuite/22_locale/moneypunct/40712.cc b/libstdc++-v3/testsuite/22_locale/moneypunct/40712.cc

index eb3c0b5069e5ab01ba910c991c9d2171c296bf1d..f0ff60ab0beb6d662772941e5b7d469acb7d9dfc 100644 (file)
--- 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  <paolo.carlini@oracle.com>
  
@@ -22,6 +22,7 @@
  // 22.2.6.3  Template class moneypunct
  
  #include <locale>
+#include <testsuite_hooks.h>
  
  // 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<moneypunct<char> >(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 2f486cea505bc45a30316f71dc355898d00bf772..abfd7e4fe62e83c75083b69c589454261f4e8953 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char, true> __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 d4f22931887202d4d3088c3682736d770af971b4..608bb21baebfcbbd8edfa9c659b1303f6e2aacd4 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 5d2fb2e9bc655728238dbcbcd1c7c6ff5cf9504b..fe62c9038889f0879e193e88c5eb23940f573c65 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 028a81575446e1058b2959da441327c05f33efda..a8c277fc84195ecece9bae49818b2ac9cc27cc08 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<wchar_t, true> __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 d4f22931887202d4d3088c3682736d770af971b4..608bb21baebfcbbd8edfa9c659b1303f6e2aacd4 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 7e8facf9c15dd802c9c6710e208bbab56cecbc37..40254ab1f7b14c4ff47b9bf0f15315eae1288630 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 11b324bc2b033f11c7d552c5e4e27ade070707c7..a3d91094ba18fd854118b34c7a4c4f993107b4e5 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char>("de_DE"));
+  locale loc_byname(locale::classic(), new moneypunct_byname<char>(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 99faa87ccb1ab50184eeb70302fcabeb57d846a5..9685a6f3f8c9714b03485c0c2c1463a71bed4e00 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 48ea5dce4a6fa3080f08619dea0999835d29efa4..b51cf699d28ac180ef32f1421e92f7646afd133e 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 13fb837a1b4d087b9edc0433c36fa992af381eb6..14c54961b56b1fde0b95fd119c07e4006727ef72 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char>& ng = use_facet<num_get<char> >(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 d1af38cd60d6cc79b15d948895882fb0636e4a47..06a25464edbd13ee4c64b91ad707dd6f007430ca 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char>& ng = use_facet<num_get<char> >(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 058b562b1c7111f8c846be821abb8c93f8a79638..16c914a1b998636ec3ecd7eed648d2f25e7c3de4 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 fa4f92469cfe6170aad44a6f1581b5039203b393..c864049e58328ed65076cf4362a604c5d6e0f61a 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 c488ecc96198779885094693029c2daba1bc1bdc..eacfcbcd46d3bfed029e16c5c6cfd175ce6e9ae9 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -59,6 +59,6 @@ int main()
    two.push_back(&test04);
    two.push_back(&test05);
    two.push_back(&test06);
-  run_tests_wrapped_locale("ja_JP.eucjp", two);
+  run_tests_wrapped_locale("ja_JP.eucJP", two);
    return 0;
  }
diff --git a/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc b/libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc

index 6d3c9cd2e318f3fead33957f55847a00593e846e..a4f35e749a3bdaf7298049570bb320f810266a50 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 d0776dcda091988113098b291848dc66949a8e21..d599347ddab3131e24411e9315cb6eabc8f840de 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 cc4aae193dff3b192218184834ab4ada970d911f..ed78cc32c874fa627e75a17e8ebf9a557449bdfb 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<wchar_t>& ng = use_facet<num_get<wchar_t> >(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 8e0dc5b171db20765aa339e20f1e1fcbd96fc8fe..e3e06c9b3052e94438af6c33e7fb804654ae15a5 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<wchar_t>& ng = use_facet<num_get<wchar_t> >(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 953f3ec83cd14ab6d31cc0d9b52602c33f07dfee..f18c67cea6d957fdf54f781ac0472ce20171343b 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 fa4f92469cfe6170aad44a6f1581b5039203b393..c864049e58328ed65076cf4362a604c5d6e0f61a 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 c488ecc96198779885094693029c2daba1bc1bdc..eacfcbcd46d3bfed029e16c5c6cfd175ce6e9ae9 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -59,6 +59,6 @@ int main()
    two.push_back(&test04);
    two.push_back(&test05);
    two.push_back(&test06);
-  run_tests_wrapped_locale("ja_JP.eucjp", two);
+  run_tests_wrapped_locale("ja_JP.eucJP", two);
    return 0;
  }
diff --git a/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc b/libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc

index a1aa072a636343607e5c6d1e6497b6ec3012e8a7..8d448d9cfda05ce1e4940302c054ad3facd6b78c 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 65a886a5d1e784c8446a7602cc70cfe198c41d1c..aa03a60e6ccc5d40b9c66e9880b807ee86292fc3 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 0b617d760f83755cf88a3b0b156b05010eaf3ca5..7aa2c0c6291c40f4083124d3065a3b8e5b2003e6 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 781e3745dd23247f199b0afaa7bfa199ad50f9c4..ce6afd4fefea591d71d746d5c7441dc4632299ff 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 d3b6e8d11a403dddc13d60e0b838c99ed23f38d2..bada771c2ee3797d4298c3eac1c7b970b568666f 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 8fa28607fc0ee3089307f15c2eb9b2f24b0ef142..0b8d14af2ce7f48266839e893b6170c19671a464 100644 (file)
--- 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<char>& np = use_facet<num_put<char> >(l1);
  const numpunct<char>& npunct = use_facet<numpunct<char> >(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<char>& npunct3 = use_facet<numpunct<char> >(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 d8d6cc66ca7d2ad149646799ad45d69c22a3e8bc..d5ea3a5479454f3869fc74d1d68045cb7fd232dd 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 e43cb6017be5feb565f698c2941c92e62477c2f8..69b9dc317d863b9a81712853b442229c5e54c002 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 6d514079e79e059a58ffbe4cf37582963efaf62d..116044b1eb909ca317c1533db93e1f30015a9f68 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 5923860f066d2af8710e7ffbceca04f1a572a7d1..8cca878d0fd1892eba0229f2dece25460ed03c8d 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 cdffd52b65f76fb245b89c417a253af4c2150d47..ab92f031d3d4f132e04d2eb27fc6920f561c0922 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 4180382fe2fb2d362b65fc73c90154a3100b3710..d2c5be454f6c1842b0ced4c1958121f7c1fe7604 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 beaa319a55efa17328a7328a3d0cbf0e346ea414..f2efb1623477cdb6ba0162b95857f15f6f58f965 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 e372f2a0464750e1b8fbb7ed60daf8a248895ce6..4856dea8eed935b4d22cc2d91347ec19a881aa05 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 ce69346738d1e4e0711da61fe10b6e4fe88b7425..17bb2a31b5ec81da1aaefe4eefc51c958fdcc8fa 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 e9c13cf19490a0a01f2125f8dd85e73202c044db..ce3ce0b2f80ba52e973a192eed9baba6361797c1 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 8de6dda3e182b9f52fc3256c22c19bc143acf592..18075a58764589d6e7c98b0906b20a1d29953451 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char>& nump_it = use_facet<numpunct<char> >(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 ab24f85624d59712b61094c6ee9f155f853c7d0d..e92737be777fc91bd9946ec9d3e7afe2e6370b24 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 5cfd13410d41d90803d75c7cc300c272d4b3febf..996b4452a6ca168153c9948ae2f2029db3820e8d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 72d84a9b5784d364079ef7423d207e04e6e20225..352d7a92bd603e5b42659dd8036549686fdb27f6 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 ab24f85624d59712b61094c6ee9f155f853c7d0d..e92737be777fc91bd9946ec9d3e7afe2e6370b24 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 5cfd13410d41d90803d75c7cc300c272d4b3febf..996b4452a6ca168153c9948ae2f2029db3820e8d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0d13315e1d4afc2afaa90a8dc230e97594e1f42c..8cc768a0c6bba8d45713c2edcf1a54201a78c83f 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char>("de_DE"));
+  locale loc_byname(locale::classic(), new numpunct_byname<char>(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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eddb670b8b900cd222452c0189ae49bfaf734f2d..0e4b03b732fe216b18baffa7f60e770e1344b377 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b899fafbe90cbe05cf8a330caa0a4a81851b87ea..43e2381d2cb1b6a565d34955fe20ff9787f31780 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 1ea933df0e9de47cd5899fde28c8c7185420c358..3e351b4df98d1cbd327cc6efff73ba77e1c3ad29 100644 (file)
--- 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  <ruediger@c-plusplus.de>
@@ -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 1f1582e5a34a060b7a94bd6f8455c3ed3ebab7e6..89f26c45b18a1119686977ba940ada5fe0e3919e 100644 (file)
--- 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  <ruediger@c-plusplus.de>
@@ -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 b95610ab03e0b83384db03bc1050e08d336efb1e..d2cf27432aaceef440214b6c2f918067e04f1705 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 366610687b0b6517cd88fc3603125fbf6a112e5b..4f77123794b12943bb43b4c72e92068c1843bd7e 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 a46b94b916ebce05099e4b3ea6817a7d77fa6abb..52b74bc66b69df5c702818524b4beee61ae8b1a5 100644 (file)
--- 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  <paolo.carlini@oracle.com>
  
@@ -33,7 +33,7 @@ void test01()
  
    typedef istreambuf_iterator<char> 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 e7a40edc897fc42ee4833c357edfdf7639d6e2f1..3f3ec38f0f35e73e5e3416b47bcd6f02cfdf8952 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0853219a1d97c5d128f8dce38e45bcef8daee15b..742a5b9339c98411256076bb7e68126fe209063d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 65eec12b5a41ac442a1dc27e199daa09cf43cae7..7a6ad65d51e4a68ffdae8b08e345d61e48743469 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 aa3df0058d00dcf30fb71f19b9c29d57a9cd0621..0bbd1ce864cc4de694ae3b8693ee1d04d6a74f04 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b15305e50df6bc50fd0257a95a0a3ed9247fcbe7..4ea1d71a2cb3ec7dd590b80322263498ad903c9d 100644 (file)
--- 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  <paolo.carlini@oracle.com>
  
@@ -33,7 +33,7 @@ void test01()
  
    typedef istreambuf_iterator<wchar_t> 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 25e797324352eee1762ab32f0c9fb80bfe3432d1..a177ba787504a47cf4888252bab5f40205ccb384 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -32,7 +32,7 @@ void test01()
  
    typedef istreambuf_iterator<wchar_t> 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 e7a40edc897fc42ee4833c357edfdf7639d6e2f1..3f3ec38f0f35e73e5e3416b47bcd6f02cfdf8952 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0853219a1d97c5d128f8dce38e45bcef8daee15b..742a5b9339c98411256076bb7e68126fe209063d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 158047299ac8fedf948b049bec059b63ca947ac1..7ceb6c467847c6950e850e336bd030dca7fe43c4 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<char>& tim_get = use_facet<time_get<char> >(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 e7a40edc897fc42ee4833c357edfdf7639d6e2f1..3f3ec38f0f35e73e5e3416b47bcd6f02cfdf8952 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0853219a1d97c5d128f8dce38e45bcef8daee15b..742a5b9339c98411256076bb7e68126fe209063d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 b97f66c59d9b95d7a71c486aac25e6d1fce3339a..d3a92cb7059099402d2b46dbd5c8e74b6a2c1ade 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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<wchar_t>& tim_get = use_facet<time_get<wchar_t> >(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 e7a40edc897fc42ee4833c357edfdf7639d6e2f1..3f3ec38f0f35e73e5e3416b47bcd6f02cfdf8952 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0853219a1d97c5d128f8dce38e45bcef8daee15b..742a5b9339c98411256076bb7e68126fe209063d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 3445a9a371d318e9f6978a9d0cf7f4f281091e8f..027492a910fd585f4a21bf741dbdfd87b804bd36 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 8f946587921e7b7b948df4c372da993285b85b8f..75d7e4a34a1aefc379d5146f93c249e8ea9bab87 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 e7a40edc897fc42ee4833c357edfdf7639d6e2f1..3f3ec38f0f35e73e5e3416b47bcd6f02cfdf8952 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0853219a1d97c5d128f8dce38e45bcef8daee15b..742a5b9339c98411256076bb7e68126fe209063d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0f5c4d9f1cfe634c89d18d64bcb82515d05d7726..1415e3d829ea0cbc916fbef30841f5dd73321760 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 7d3f6d554fc2a04f79160077c50252d20510f787..f32067d76d7dacca4233e6b3677f449eb40f79e9 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 e7a40edc897fc42ee4833c357edfdf7639d6e2f1..3f3ec38f0f35e73e5e3416b47bcd6f02cfdf8952 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0853219a1d97c5d128f8dce38e45bcef8daee15b..742a5b9339c98411256076bb7e68126fe209063d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 3a936d061733843afca9c5ea24b25e7a1a3ff05f..47076ea2ce186010400cd2ef54b5eb0702507efc 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 5ae798d73cc03d32d5574eb95b7a6c46593e79e9..27b5da8575f63b9b7550e49616f61fc558d8617c 100644 (file)
--- 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<char> 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 79b280bfa7a1c4fbc05d7098e190aefa01e39b7c..5a8bc4809140d0c3e32ce6aca9ed28111f915f86 100644 (file)
--- 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  <paolo.carlini@oracle.com>
  
@@ -34,7 +34,7 @@ void test01()
    typedef istreambuf_iterator<char> 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 e7a40edc897fc42ee4833c357edfdf7639d6e2f1..3f3ec38f0f35e73e5e3416b47bcd6f02cfdf8952 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 0853219a1d97c5d128f8dce38e45bcef8daee15b..742a5b9339c98411256076bb7e68126fe209063d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 47102a3e52117b949a3f82768304aaeffb3cca8a..d557c18eb9a79307cb28c76e5a69a732964f9c86 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 e1789beda11dce70f01771e020e8691824dc530e..5102a79dd1405ee47a691822d5f09a64d2bf6414 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 691253d2235c4ce947c1a960e15185b4e73998ec..896d5982db24fd4147622c0735f3e36af2e0a407 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 85cb3de61eb08b63295bb46bb97f7baa2d7e8972..4fe83399ec13ebd303e5f44e7545cef9b8655445 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 d7b5b1886d9545206a1a9fa225f1d9405768d190..57e2bc850261c8617f9962a2a231ba3c8a13e483 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 85cb3de61eb08b63295bb46bb97f7baa2d7e8972..4fe83399ec13ebd303e5f44e7545cef9b8655445 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 d7b5b1886d9545206a1a9fa225f1d9405768d190..57e2bc850261c8617f9962a2a231ba3c8a13e483 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 84523248dca89443e952d7faa2a14ae2c4f9bb73..f9a2557df33215674257cf4fbd2b051f14e2c417 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 42aa63590d500e7a644bc2aa67aa0672f1bd2a4f..c120be5ec47539cb9cb41ff7a7183f689ead53d8 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 3aa6f68dcd40eb76143c46b8fc153b66961c8898..ff567f271a6a0b149ca5ae1be47a272dc4d07b84 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 82b8cc6b22ab37f401049a89b666cda40a8072fb..5fe87460b88eb8f0bbe89ef5199eb073f370f57d 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 704610d3435f46d74c57702ddbcb0101a504f8be..b2d308d61d4a63c7d6b0973a8fccfc032abc83cc 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 1a1775634cb7128863471ba33b19bc6d81339ab8..77e1a5fc2172591c57aa058a63a1b52ba6ebdb92 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 840b504d7a96d2137aeb38c919ede6f9f7da9d01..ea86b4aba34d6d3748c7d406ca6a986e07b6ba08 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 012244c18eb616e8f74a43a180831b88054decd1..4e5a2944a28b75c9445ea5cc3afb6392c2f08817 100644 (file)
--- 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<char> &tp = use_facet<time_put<char> >(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 cedfadd82bb36fc1030d7660851a6bea8840d144..e3ddf588714125a39d6470dc1f7d24a4c6b1cb77 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 af9583365ec18596241a06564767fd913d510c19..0ee4db510ce0e19262fc3e8dbe773ce7ae38e379 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 2b2cd531a418ac5d0c6be786c5ad7221c19b270c..2580b4c59619d40eaa43389e3b09119b13ffca0c 100644 (file)
--- 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  <pcarlini@suse.de>
  
@@ -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 f2d0bd8f3e29da2621f6ecb9265b4d208226613d..0605ba419a89441cb9cced98377bda4941c34705 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 6fa664aa4d167741c9fa620e1a333d80f8334a92..76eb05346b9da66fee2bdf83390229a4139021de 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 a6e4b634fd9c96a2b20980f058aa99d805789de2..11cdf804539b41a81633e8f1ae406948cda9c2cf 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 062c218264f140fe7b0490c9b09db282ea026ada..b9629084b8efb45bad1ad6b426dcfbd7bc95c828 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 eaf49fc44a81b00c71c26e2bc927d60b5c209261..0749172b9af00f1b4fdda3af301c12e635f20d3c 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 fad15ee71190ff30bcb58f82f34dfea35f2fb0f8..62a4eddfc79fda1516b5cafe0839da60410dd021 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 cedfadd82bb36fc1030d7660851a6bea8840d144..e3ddf588714125a39d6470dc1f7d24a4c6b1cb77 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 bb9170772e7b58ddc8a5c2b159166f5455667a90..5695dacad9425e170c162c5d1d90c1f5595ac332 100644 (file)
--- 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  <bkoz@redhat.com>
  
@@ -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 9f2b65bbeaf294f5c9d11720d240735e4bedf2f4..2fbfae316afda6718f8d524d2462c81f887cc647 100644 (file)
--- 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 db3c0745878ef03a054cf39b650b8081ddb48852..7647defecb7b5db072afd13c1410eb7fe4035a99 100644 (file)
--- 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 3eef707b8612d2c684a22fc7cacfe871e442b092..19ad9fb145d2346c2a82e5e995cdc6817300baa9 100644 (file)
--- 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 685302c9ab29d532a57f63681ec9daa1f26fabee..0d9cc8eea55b48050f8f8e80c9f78434e08cbd29 100644 (file)
--- 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 fb2cd2aed949dec8dbc74edc9d199e392d0bcf75..165cba11147bed3ae986df23d2324d1bc95ec316 100644 (file)
--- 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 e5aae9ff85fee9938ea980c88e7f4312fc44da8c..3a65a99b6fae03fb8be4ffaed20caad133a3dfe3 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/14975-1.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "en_US" }
+// { dg-require-namedlocale "en_US.ISO8859-1" }
  
  // 2004-04-16  Petur Runolfsson  <peturr02@ru.is>
  
@@ -43,7 +43,7 @@ void test01()
    bool test __attribute__((unused)) = true;
  
    Buf fb;
-  locale loc_us = locale("en_US");
+  locale loc_us = locale(ISO_8859(1,en_US));
    fb.pubimbue(loc_us);
    fb.open("tmp_14975-1", ios_base::out);
    
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc

index 07776b8a1dc7b12f164ee0c73d0d8d468c696aeb..d5bc14b05d8674e44cf78eb31ffbbc8ab39be898 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2003-05-13 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -43,7 +43,7 @@ void test02()
    VERIFY( p != bad);
  
    // According to 27.5.2.2.1, loc == getloc() after pubimbue(loc).
-  locale loc_de = locale("de_DE");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    locale ret = ob.pubimbue(loc_de);
    VERIFY( ob.getloc() == loc_de );
  }
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc

index 27abe85184b1e6b98eb611e2c0b2e1ea098eb786..27eecb33467343838bdafb87c93a01cddc21755d 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/9322.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "en_US" }
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "en_US.ISO8859-1" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -36,10 +36,10 @@ void test07()
    std::filebuf ob;
    VERIFY( ob.getloc() == loc );
  
-  locale::global(locale("en_US"));
+  locale::global(locale(ISO_8859(1,en_US)));
    VERIFY( ob.getloc() == loc );
  
-  locale loc_de = locale("de_DE");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    locale ret = ob.pubimbue(loc_de);
    VERIFY( ob.getloc() == loc_de );
    VERIFY( ret == loc );
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13007.cc

index 0502e912c27d70841cf5cfeb02e7e2d494b208e2..9d33dfb5044036cd0b088ba62e45f64e18a2d11f 100644 (file)
--- 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 f71a385ce85e8bad5c3c911a25de87d72d29a3ac..3ca37bad49577131ceb91fa2abcfd80f300ff638 100644 (file)
--- 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 cb44bdfc39d9bc0f891d055722ee634b27e48fb6..5982f28d124426132672ca00ecd91813b9edf441 100644 (file)
--- 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 169f2409fedf8d5164f2266699c92ce24bbae8cf..2f46d9c01147a066520b3455e3e85269d055da88 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/13582-3.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "en_US" }
-// { dg-require-namedlocale "fr_FR" }
+// { dg-require-namedlocale "en_US.ISO8859-1" }
+// { dg-require-namedlocale "fr_FR.ISO8859-15" }
  
  // 2004-01-11  Petur Runolfsson  <peturr02@ru.is>
  
@@ -32,8 +32,8 @@ void test01()
    bool test __attribute__((unused)) = true;
    using namespace std;
  
-  locale loc_en(locale("en_US"));
-  locale loc_fr(locale("fr_FR"));
+  locale loc_en(locale(ISO_8859(1,en_US)));
+  locale loc_fr(locale(ISO_8859(15,fr_FR)));
  
    const char* name = "tmp_13582-3.tst";
  
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc

index b3b08ad38e4d2304cae26d1d2a1cff2454694c26..85984b29f87e7588550d5c289b234f6b382c2d03 100644 (file)
--- 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 8c663da964e5c26aaf617544913ea487d82fb5ff..3a6650d5d52564249b91db3a470edc6b9b553460 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2003-05-13 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -43,7 +43,7 @@ void test02()
    VERIFY( p != bad);
  
    // According to 27.5.2.2.1, p1, loc == getloc() after pubimbue(loc).
-  locale loc_de = locale("de_DE");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    locale ret = ob.pubimbue(loc_de);
    VERIFY( ob.getloc() == loc_de );
  }
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc

index 6b15839bf4deb33155ff6fae93a53d935419649b..9e17218883dd8563bf2a61fbbf03f98185b1977c 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/9322.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "en_US" }
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "en_US.ISO8859-1" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -36,10 +36,10 @@ void test07()
    std::wfilebuf ob;
    VERIFY( ob.getloc() == loc );
  
-  locale::global(locale("en_US"));
+  locale::global(locale(ISO_8859(1,en_US)));
    VERIFY( ob.getloc() == loc );
  
-  locale loc_de = locale("de_DE");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    locale ret = ob.pubimbue(loc_de);
    VERIFY( ob.getloc() == loc_de );
    VERIFY( ret == loc );
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc

index 297bdcad7bdf5b9136b568dbab326884cf743152..6e3e56fa6efbdefcbd7d5ede2772ce7b87ca322f 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/9520.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE.ISO-8859-15@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2003-05-03  Petur Runolfsson <peturr02@ru.is>
  
@@ -36,7 +36,7 @@ void test01()
      putc(static_cast<unsigned char>(i), file);
    fclose(file);
  
-  locale loc (locale("de_DE.ISO-8859-15@euro"));
+  locale loc (locale(ISO_8859(15,de_DE)));
    wchar_t buf[1];
    wfilebuf fb;
    fb.pubimbue(loc);
diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_ios/copyfmt/char/2.cc

index 61cf9fe312c2c761d3b593fb55e6cecf042c6e4c..d7cd719d8200a99608b70b274eb772574fa37344 100644 (file)
--- 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 666b672d3a8a28c45a4bff5bda151a4ba3e7d9ca..306cd60d4364dad1368f1292e267035652698c33 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 1999-11-15 Kevin Ediger  <kediger@licor.com>
  // test the floating point inserters (facet num_put)
@@ -42,7 +42,7 @@ test02()
    os2.setf(ios::fixed);
  
    // Check it can be done in a locale with grouping on.
-  locale loc2 = locale("de_DE");
+  locale loc2 = locale(ISO_8859(15,de_DE));
    os2.imbue(loc2);
    os2 << fixed << setprecision(3) << val2 << endl;
    os2 << endl;
diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_arithmetic/wchar_t/2.cc

index da1e13d01208a3c817ba069c76c5707f5d0c8da2..a88d4811c20ed249e38d6eb121d1b69b00bed6d0 100644 (file)
--- 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 afea72c7176df5b3b267f538904d283fbbee553b..624fe7272988700fb131546b49f12bf991b2cd9f 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_streambuf/cons/57394.cc
@@ -16,7 +16,7 @@
  // <http://www.gnu.org/licenses/>.
  
  // { dg-options "-std=gnu++11" }
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 27.6.3 template class basic_streambuf
  
@@ -105,7 +105,7 @@ void streambuf::test_swap() const
  
  int main()
  {
-  std::locale loc("de_DE");
+  std::locale loc(ISO_8859(15,de_DE));
    streambuf s(loc);
    s.test_copy();
    s.test_assign();
diff --git a/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc b/libstdc++-v3/testsuite/27_io/basic_streambuf/imbue/char/13007-2.cc

index f7b069a97e3e3cf3968a345c3459ed7cbcd3e00e..6567615b021244e86ffc3d78eab6b93db9b50ade 100644 (file)
--- 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 70a65f4982afd7dbedb2ad6a23c1453e18bce2df..00e89322e9aaf9e7fde63235ad4c34d41a7cdf3f 100644 (file)
--- 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 87293b0977cc847d35e8f0bb78aba82a1be0f86d..56176c1a85348276d746e7a45be4aebee8b39da2 100644 (file)
--- 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 23528cecadea9b0046078cdad3d3af6acb8e8711..f5f5cd89e9ef3f860df08f5c07c27dd7806b731e 100644 (file)
--- 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 9770cb63901eef95a348522380456b5f259558bc..e2ac91afb647570b09db548afa47f73f682d2ac6 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/char/9322.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "en_US" }
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "en_US.ISO8859-1" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -35,10 +35,10 @@ void test03()
    std::stringbuf ob;
    VERIFY( ob.getloc() == loc );
  
-  locale::global(locale("en_US"));
+  locale::global(locale(ISO_8859(1,en_US)));
    VERIFY( ob.getloc() == loc );
  
-  locale loc_de = locale("de_DE");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    locale ret = ob.pubimbue(loc_de);
    VERIFY( ob.getloc() == loc_de );
    VERIFY( ret == loc );
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc

index ca5b4995b5b448b21268e8241013db5ce5e8efde..ae32971c05b7489adaee4c0fe313092bb68ae1cf 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/imbue/wchar_t/9322.cc
@@ -1,5 +1,5 @@
-// { dg-require-namedlocale "en_US" }
-// { dg-require-namedlocale "de_DE" }
+// { dg-require-namedlocale "en_US.ISO8859-1" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2001-05-21 Benjamin Kosnik  <bkoz@redhat.com>
  
@@ -35,10 +35,10 @@ void test03()
    std::wstringbuf ob;
    VERIFY( ob.getloc() == loc );
  
-  locale::global(locale("en_US"));
+  locale::global(locale(ISO_8859(1,en_US)));
    VERIFY( ob.getloc() == loc );
  
-  locale loc_de = locale("de_DE");
+  locale loc_de = locale(ISO_8859(15,de_DE));
    locale ret = ob.pubimbue(loc_de);
    VERIFY( ob.getloc() == loc_de );
    VERIFY( ret == loc );
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc

index 4347557b06e264bfcc20a34158f42fad9ccb7fea..8514eaefd7bb5d02698b9d9d0d6a9546afb5c201 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/char/1.cc
@@ -1,5 +1,5 @@
  // { dg-options "-std=gnu++11" }
-// { dg-require-namedlocale "de_DE@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-1" }
  
  // 2010-03-01  Paolo Carlini  <paolo.carlini@oracle.com>
  
@@ -28,7 +28,7 @@ void test01()
  {
    bool test __attribute__((unused)) = true;
  
-  std::locale loc_de = std::locale("de_DE@euro");
+  std::locale loc_de = std::locale(ISO_8859(15,de_DE));
  
    std::istringstream iss;
    iss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc

index 054dea9e4aa7cdc04b7c71b879dc793e4e9fd643..ee54d3fc733dbfee35e4ed45baf5c9d8f9a766ba 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_money/wchar_t/1.cc
@@ -1,5 +1,5 @@
  // { dg-options "-std=gnu++11" }
-// { dg-require-namedlocale "de_DE@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2010-03-01  Paolo Carlini  <paolo.carlini@oracle.com>
  
@@ -28,7 +28,7 @@ void test01()
  {
    bool test __attribute__((unused)) = true;
  
-  std::locale loc_de = std::locale("de_DE@euro");
+  std::locale loc_de = std::locale(ISO_8859(15,de_DE));
  
    std::wistringstream iss;
    iss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc

index 527278fbca752029092a92de2e554a3162015c34..ecf097e23b7d83c2327543dc99dd9b66e439b0af 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/char/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE.utf8" }
+// { dg-require-namedlocale "de_DE.UTF-8" }
  // { dg-options " -std=gnu++11 " }
  
  // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
@@ -32,7 +32,7 @@ void test01()
    using namespace std;
    bool test __attribute__((unused)) = true;
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE.utf8");
+  locale loc_de = locale("de_DE.UTF-8");
    VERIFY( loc_de != loc_c );
    istringstream iss;
    iss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc

index ec109605f7d8838fb227e7ba757918d9037e1555..cf8dd1c170e5c0ec02899860785c357cb8093508 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/get_time/wchar_t/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE.utf8" }
+// { dg-require-namedlocale "de_DE.UTF-8" }
  // { dg-options " -std=gnu++11 " }
  
  // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
@@ -33,7 +33,7 @@ void test01()
    using namespace std;
    bool test __attribute__((unused)) = true;
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE.utf8");
+  locale loc_de = locale("de_DE.UTF-8");
    VERIFY( loc_de != loc_c );
    wistringstream iss;
    iss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc

index e01ccba09d442380fb595840d73195129886a882..b4e209284354769ed5afcad9760b31937f7ef6a9 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/char/1.cc
@@ -1,5 +1,5 @@
  // { dg-options "-std=gnu++11" }
-// { dg-require-namedlocale "de_DE@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2010-03-01  Paolo Carlini  <paolo.carlini@oracle.com>
  
@@ -28,7 +28,7 @@ void test01()
  {
    bool test __attribute__((unused)) = true;
  
-  std::locale loc_de = std::locale("de_DE@euro");
+  std::locale loc_de = std::locale(ISO_8859(15,de_DE));
  
    std::ostringstream oss;
    oss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc

index f39e854164e205453653beb95fae4ca1fda95cec..d67570ab350a69bb503b846c1d796d4d78f483c1 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_money/wchar_t/1.cc
@@ -1,5 +1,5 @@
  // { dg-options "-std=gnu++11" }
-// { dg-require-namedlocale "de_DE@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2010-03-01  Paolo Carlini  <paolo.carlini@oracle.com>
  
@@ -28,7 +28,7 @@ void test01()
  {
    bool test __attribute__((unused)) = true;
  
-  std::locale loc_de = std::locale("de_DE@euro");
+  std::locale loc_de = std::locale(ISO_8859(15,de_DE));
  
    std::wostringstream oss;
    oss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc

index 25cf6c46b793f565c372b484b660dbabb5b895d3..82a92e31e47741f6208dbabed16163ef9f4055e2 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/char/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE.utf8" }
+// { dg-require-namedlocale "de_DE.UTF-8" }
  // { dg-options " -std=gnu++11 " }
  
  // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
@@ -32,7 +32,7 @@ void test01()
    using namespace std;
    bool test __attribute__((unused)) = true;
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE.utf8");
+  locale loc_de = locale("de_DE.UTF-8");
    VERIFY( loc_de != loc_c );
    ostringstream oss;
    oss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc

index 44521fc5ed0e3023955be9798a52e091b56edf69..dafa83580a759159c4ed5627c01e4bd345589e25 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/manipulators/extended/put_time/wchar_t/2.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE.utf8" }
+// { dg-require-namedlocale "de_DE.UTF-8" }
  // { dg-options " -std=gnu++11 " }
  
  // 2014-04-14 Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
@@ -32,7 +32,7 @@ void test01()
    using namespace std;
    bool test __attribute__((unused)) = true;
    locale loc_c = locale::classic();
-  locale loc_de = locale("de_DE.utf8");
+  locale loc_de = locale("de_DE.UTF-8");
    VERIFY( loc_de != loc_c );
    wostringstream oss;
    oss.imbue(loc_de);
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/13582-1_xin.cc

index 47a419f2e0d6826c2000465a8bec61b1ddb1c593..4fd1bfae023648ec777a49a93381ac533242b937 100644 (file)
--- 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 e2412e4996c0ef2f4960f8bc2a7306fcbc78bbf6..94d3415bc9bb8a7fd8cab9b7c4b12b0c6ad81873 100644 (file)
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/9520.cc
@@ -1,4 +1,4 @@
-// { dg-require-namedlocale "de_DE.ISO-8859-15@euro" }
+// { dg-require-namedlocale "de_DE.ISO8859-15" }
  
  // 2003-04-30  Petur Runolfsson <peturr02@ru.is>
  
@@ -35,7 +35,7 @@ void test01()
      putc(static_cast<unsigned char>(i), file);
    fclose(file);
  
-  locale loc (locale("de_DE.ISO-8859-15@euro"));
+  locale loc (locale(ISO_8859(15,de_DE)));
    locale::global(loc); // Set locale for stdin
  
    VERIFY( freopen(name, "r", stdin) );
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp

index 6a62dfd72717a1e007ae95751ac20ccabb56d58a..f5528a02e96176847801b0155d7e2b8ce4b509b3 100644 (file)
--- 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 <locale>"
        puts $f "#include <cstdio>"
-      puts $f "using namespace std;"   
+      puts $f "#include <cstring>"
+      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 d0c8b1d6bfd426760cac0082b9f0cd3c6697c33e..0d8afbd2a3f69d0d46212c63aedc65a14e83f51a 100644 (file)
--- 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
author	redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
	Fri, 13 Nov 2015 15:25:48 +0000 (15:25 +0000)
committer	redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
	Fri, 13 Nov 2015 15:25:48 +0000 (15:25 +0000)