Skip to content

R
riscv-gcc-1
Commit 3d838e28 by Benjamin Kosnik
Options

[multiple changes] 


2003-04-14  Andreas Tobler  <toa@pop.agri.ch>
 	    Benjamin Kosnik  <bkoz@redhat.com>

	* config/os/generic/ctype_inline.h: Fix.

2003-04-14  Benjamin Kosnik  <bkoz@redhat.com>

	* testsuite/testsuite_hooks.h
	(__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher):
	Change to run_named_locale_test.
	* testsuite/testsuite_hooks.cc (__gnu_cxx_test): Same.

	* testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: Use
	run_test_named_locale.
	* testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: Same.
	* testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc: Same.
	* testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: Same.
	* testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: Same.
	* testsuite/22_locale/codecvt/encoding/wchar_t/4.cc: Same.
	* testsuite/22_locale/codecvt/in/wchar_t/2.cc: Same.
	* testsuite/22_locale/codecvt/in/wchar_t/3.cc: Same.
	* testsuite/22_locale/codecvt/in/wchar_t/4.cc: Same.
	* testsuite/22_locale/codecvt/in/wchar_t/7.cc: Same.
	* testsuite/22_locale/codecvt/in/wchar_t/8.cc: Same.
	* testsuite/22_locale/codecvt/in/wchar_t/9.cc: Same.
	* testsuite/22_locale/codecvt/length/wchar_t/2.cc: Same.
	* testsuite/22_locale/codecvt/length/wchar_t/3.cc: Same.
	* testsuite/22_locale/codecvt/length/wchar_t/4.cc: Same.
	* testsuite/22_locale/codecvt/length/wchar_t/7.cc: Same.
	* testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: Same.
	* testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: Same.
	* testsuite/22_locale/codecvt/max_length/wchar_t/4.cc: Same.
	* testsuite/22_locale/codecvt/out/wchar_t/2.cc: Same.
	* testsuite/22_locale/codecvt/out/wchar_t/3.cc: Same.
	* testsuite/22_locale/codecvt/out/wchar_t/4.cc: Same.
	* testsuite/22_locale/codecvt/out/wchar_t/7.cc: Same.
	* testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: Same.
	* testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: Same.
	* testsuite/22_locale/codecvt/unshift/wchar_t/4.cc: Same.
	* testsuite/22_locale/collate/compare/char/1.cc: Same.
	* testsuite/22_locale/collate/compare/char/2.cc: Same.
	* testsuite/22_locale/collate/compare/char/3.cc: Same.
	* testsuite/22_locale/collate/compare/wchar_t/1.cc: Same.
	* testsuite/22_locale/collate/compare/wchar_t/2.cc: Same.
	* testsuite/22_locale/collate/compare/wchar_t/3.cc: Same.
	* testsuite/22_locale/collate/hash/char/2.cc: Same.
	* testsuite/22_locale/collate/hash/wchar_t/2.cc: Same.
	* testsuite/22_locale/collate/transform/char/2.cc: Same.
	* testsuite/22_locale/collate/transform/char/3.cc: Same.
	* testsuite/22_locale/collate/transform/wchar_t/2.cc: Same.
	* testsuite/22_locale/collate/transform/wchar_t/3.cc: Same.
	* testsuite/22_locale/collate_byname/1.cc: Same.
	* testsuite/22_locale/ctype/is/char/2.cc: Same.
	* testsuite/22_locale/ctype/is/wchar_t/2.cc: Same.
	* testsuite/22_locale/ctype/narrow/wchar_t/3.cc: Same.
	* testsuite/22_locale/ctype/widen/wchar_t/2.cc: Same.
	* testsuite/22_locale/ctype/widen/wchar_t/3.cc: Same.
	* testsuite/22_locale/facet/2.cc: Same.
	* testsuite/22_locale/locale/cons/2.cc: Same.
	* testsuite/22_locale/locale/cons/4.cc: Same.
	* testsuite/22_locale/locale/cons/5.cc: Same.
	* testsuite/22_locale/locale/cons/7.cc: Same.
	* testsuite/22_locale/locale/cons/7222-c.cc: Same.
	* testsuite/22_locale/locale/cons/7222-env.cc: Same.
	* testsuite/22_locale/locale/global_locale_objects/2.cc: Same.
	* testsuite/22_locale/messages/members/char/1.cc: Same.
	* testsuite/22_locale/messages/members/char/2.cc: Same.
	* testsuite/22_locale/messages/members/char/3.cc: Same.
	* testsuite/22_locale/messages_byname/1.cc: Same.
	* testsuite/22_locale/money_get/get/char/1.cc: Same.
	* testsuite/22_locale/money_get/get/char/2.cc: Same.
	* testsuite/22_locale/money_get/get/char/3.cc: Same.
	* testsuite/22_locale/money_get/get/char/4.cc: Same.
	* testsuite/22_locale/money_get/get/wchar_t/1.cc: Same.
	* testsuite/22_locale/money_get/get/wchar_t/2.cc: Same.
	* testsuite/22_locale/money_get/get/wchar_t/3.cc: Same.
	* testsuite/22_locale/money_get/get/wchar_t/4.cc: Same.
	* testsuite/22_locale/money_put/put/char/1.cc: Same.
	* testsuite/22_locale/money_put/put/char/2.cc: Same.
	* testsuite/22_locale/money_put/put/char/3.cc: Same.
	* testsuite/22_locale/money_put/put/wchar_t/1.cc: Same.
	* testsuite/22_locale/money_put/put/wchar_t/2.cc: Same.
	* testsuite/22_locale/money_put/put/wchar_t/3.cc: Same.
	* testsuite/22_locale/moneypunct/members/char/2.cc: Same.
	* testsuite/22_locale/moneypunct/members/wchar_t/2.cc: Same.
	* testsuite/22_locale/moneypunct_byname/1.cc: Same.
	* testsuite/22_locale/num_get/get/char/1.cc: Same.
	* testsuite/22_locale/num_get/get/char/2.cc: Same.
	* testsuite/22_locale/num_get/get/char/3.cc: Same.
	* testsuite/22_locale/num_get/get/char/5.cc: Same.
	* testsuite/22_locale/num_get/get/char/6.cc: Same.
	* testsuite/22_locale/num_get/get/wchar_t/1.cc: Same.
	* testsuite/22_locale/num_get/get/wchar_t/2.cc: Same.
	* testsuite/22_locale/num_get/get/wchar_t/3.cc: Same.
	* testsuite/22_locale/num_get/get/wchar_t/5.cc: Same.
	* testsuite/22_locale/num_get/get/wchar_t/6.cc: Same.
	* testsuite/22_locale/num_put/put/char/1.cc: Same.
	* testsuite/22_locale/num_put/put/char/2.cc: Same.
	* testsuite/22_locale/num_put/put/char/3.cc: Same.
	* testsuite/22_locale/num_put/put/char/5.cc: Same.
	* testsuite/22_locale/num_put/put/wchar_t/1.cc: Same.
	* testsuite/22_locale/num_put/put/wchar_t/2.cc: Same.
	* testsuite/22_locale/num_put/put/wchar_t/3.cc: Same.
	* testsuite/22_locale/num_put/put/wchar_t/5.cc: Same.
	* testsuite/22_locale/numpunct/members/char/1.cc: Same.
	* testsuite/22_locale/numpunct/members/char/2.cc: Same.
	* testsuite/22_locale/numpunct/members/wchar_t/1.cc: Same.
	* testsuite/22_locale/numpunct/members/wchar_t/2.cc: Same.
	* testsuite/22_locale/numpunct_byname/1.cc: Same.
	* testsuite/22_locale/numpunct_byname/2.cc: Same.
	* testsuite/22_locale/time_get/date_order/char/1.cc: Same.
	* testsuite/22_locale/time_get/date_order/wchar_t/1.cc: Same.
	* testsuite/22_locale/time_get/get_date/char/1.cc: Same.
	* testsuite/22_locale/time_get/get_date/char/2.cc: Same.
	* testsuite/22_locale/time_get/get_date/wchar_t/1.cc: Same.
	* testsuite/22_locale/time_get/get_date/wchar_t/2.cc: Same.
	* testsuite/22_locale/time_get/get_monthname/char/1.cc: Same.
	* testsuite/22_locale/time_get/get_monthname/char/2.cc: Same.
	* testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc: Same.
	* testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc: Same.
	* testsuite/22_locale/time_get/get_time/char/1.cc: Same.
	* testsuite/22_locale/time_get/get_time/char/2.cc: Same.
	* testsuite/22_locale/time_get/get_time/wchar_t/1.cc: Same.
	* testsuite/22_locale/time_get/get_time/wchar_t/2.cc: Same.
	* testsuite/22_locale/time_get/get_weekday/char/1.cc: Same.
	* testsuite/22_locale/time_get/get_weekday/char/2.cc: Same.
	* testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc: Same.
	* testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc: Same.
	* testsuite/22_locale/time_get/get_year/char/1.cc: Same.
	* testsuite/22_locale/time_get/get_year/wchar_t/1.cc: Same.
	* testsuite/22_locale/time_put/put/char/1.cc: Same.
	* testsuite/22_locale/time_put/put/char/2.cc: Same.
	* testsuite/22_locale/time_put/put/char/3.cc: Same.
	* testsuite/22_locale/time_put/put/char/4.cc: Same.
	* testsuite/22_locale/time_put/put/char/5.cc: Same.
	* testsuite/22_locale/time_put/put/char/6.cc: Same.
	* testsuite/22_locale/time_put/put/char/7.cc: Same.
	* testsuite/22_locale/time_put/put/char/8.cc: Same.
	* testsuite/22_locale/time_put/put/wchar_t/1.cc: Same.
	* testsuite/22_locale/time_put/put/wchar_t/2.cc: Same.
	* testsuite/22_locale/time_put/put/wchar_t/3.cc: Same.
	* testsuite/22_locale/time_put/put/wchar_t/4.cc: Same.
	* testsuite/22_locale/time_put/put/wchar_t/5.cc: Same.
	* testsuite/22_locale/time_put/put/wchar_t/6.cc: Same.
	* testsuite/22_locale/time_put/put/wchar_t/7.cc: Same.
	* testsuite/22_locale/time_put/put/wchar_t/8.cc: Same.
	* testsuite/27_io/basic_filebuf/imbue/char/9322.cc: Same.
	* testsuite/27_io/basic_ios/copyfmt/char/2.cc: Same.
	* testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc: Same.
	* testsuite/27_io/basic_streambuf/imbue/char/9322.cc: Same.
	* testsuite/27_io/basic_stringbuf/imbue/char/9322.cc: Same.

2003-04-14  Andreas Tobler  <toa@pop.agri.ch>

	* configure.target (_cpu_incdir_fullpath): Solaris 2.9 uses
	solaris includes, not generic.

From-SVN: r65622
parent 4ea34005
Showing with 484 additions and 292 deletions
libstdc++-v3/ChangeLog
2003-04-14 Andreas Tobler <toa@pop.agri.ch>
Benjamin Kosnik <bkoz@redhat.com>
* config/os/generic/ctype_inline.h: Fix.
2003-04-14 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/testsuite_hooks.h
(__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher):
Change to run_named_locale_test.
* testsuite/testsuite_hooks.cc (__gnu_cxx_test): Same.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc: Use
run_test_named_locale.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc: Same.
* testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc: Same.
* testsuite/22_locale/codecvt/encoding/wchar_t/2.cc: Same.
* testsuite/22_locale/codecvt/encoding/wchar_t/3.cc: Same.
* testsuite/22_locale/codecvt/encoding/wchar_t/4.cc: Same.
* testsuite/22_locale/codecvt/in/wchar_t/2.cc: Same.
* testsuite/22_locale/codecvt/in/wchar_t/3.cc: Same.
* testsuite/22_locale/codecvt/in/wchar_t/4.cc: Same.
* testsuite/22_locale/codecvt/in/wchar_t/7.cc: Same.
* testsuite/22_locale/codecvt/in/wchar_t/8.cc: Same.
* testsuite/22_locale/codecvt/in/wchar_t/9.cc: Same.
* testsuite/22_locale/codecvt/length/wchar_t/2.cc: Same.
* testsuite/22_locale/codecvt/length/wchar_t/3.cc: Same.
* testsuite/22_locale/codecvt/length/wchar_t/4.cc: Same.
* testsuite/22_locale/codecvt/length/wchar_t/7.cc: Same.
* testsuite/22_locale/codecvt/max_length/wchar_t/2.cc: Same.
* testsuite/22_locale/codecvt/max_length/wchar_t/3.cc: Same.
* testsuite/22_locale/codecvt/max_length/wchar_t/4.cc: Same.
* testsuite/22_locale/codecvt/out/wchar_t/2.cc: Same.
* testsuite/22_locale/codecvt/out/wchar_t/3.cc: Same.
* testsuite/22_locale/codecvt/out/wchar_t/4.cc: Same.
* testsuite/22_locale/codecvt/out/wchar_t/7.cc: Same.
* testsuite/22_locale/codecvt/unshift/wchar_t/2.cc: Same.
* testsuite/22_locale/codecvt/unshift/wchar_t/3.cc: Same.
* testsuite/22_locale/codecvt/unshift/wchar_t/4.cc: Same.
* testsuite/22_locale/collate/compare/char/1.cc: Same.
* testsuite/22_locale/collate/compare/char/2.cc: Same.
* testsuite/22_locale/collate/compare/char/3.cc: Same.
* testsuite/22_locale/collate/compare/wchar_t/1.cc: Same.
* testsuite/22_locale/collate/compare/wchar_t/2.cc: Same.
* testsuite/22_locale/collate/compare/wchar_t/3.cc: Same.
* testsuite/22_locale/collate/hash/char/2.cc: Same.
* testsuite/22_locale/collate/hash/wchar_t/2.cc: Same.
* testsuite/22_locale/collate/transform/char/2.cc: Same.
* testsuite/22_locale/collate/transform/char/3.cc: Same.
* testsuite/22_locale/collate/transform/wchar_t/2.cc: Same.
* testsuite/22_locale/collate/transform/wchar_t/3.cc: Same.
* testsuite/22_locale/collate_byname/1.cc: Same.
* testsuite/22_locale/ctype/is/char/2.cc: Same.
* testsuite/22_locale/ctype/is/wchar_t/2.cc: Same.
* testsuite/22_locale/ctype/narrow/wchar_t/3.cc: Same.
* testsuite/22_locale/ctype/widen/wchar_t/2.cc: Same.
* testsuite/22_locale/ctype/widen/wchar_t/3.cc: Same.
* testsuite/22_locale/facet/2.cc: Same.
* testsuite/22_locale/locale/cons/2.cc: Same.
* testsuite/22_locale/locale/cons/4.cc: Same.
* testsuite/22_locale/locale/cons/5.cc: Same.
* testsuite/22_locale/locale/cons/7.cc: Same.
* testsuite/22_locale/locale/cons/7222-c.cc: Same.
* testsuite/22_locale/locale/cons/7222-env.cc: Same.
* testsuite/22_locale/locale/global_locale_objects/2.cc: Same.
* testsuite/22_locale/messages/members/char/1.cc: Same.
* testsuite/22_locale/messages/members/char/2.cc: Same.
* testsuite/22_locale/messages/members/char/3.cc: Same.
* testsuite/22_locale/messages_byname/1.cc: Same.
* testsuite/22_locale/money_get/get/char/1.cc: Same.
* testsuite/22_locale/money_get/get/char/2.cc: Same.
* testsuite/22_locale/money_get/get/char/3.cc: Same.
* testsuite/22_locale/money_get/get/char/4.cc: Same.
* testsuite/22_locale/money_get/get/wchar_t/1.cc: Same.
* testsuite/22_locale/money_get/get/wchar_t/2.cc: Same.
* testsuite/22_locale/money_get/get/wchar_t/3.cc: Same.
* testsuite/22_locale/money_get/get/wchar_t/4.cc: Same.
* testsuite/22_locale/money_put/put/char/1.cc: Same.
* testsuite/22_locale/money_put/put/char/2.cc: Same.
* testsuite/22_locale/money_put/put/char/3.cc: Same.
* testsuite/22_locale/money_put/put/wchar_t/1.cc: Same.
* testsuite/22_locale/money_put/put/wchar_t/2.cc: Same.
* testsuite/22_locale/money_put/put/wchar_t/3.cc: Same.
* testsuite/22_locale/moneypunct/members/char/2.cc: Same.
* testsuite/22_locale/moneypunct/members/wchar_t/2.cc: Same.
* testsuite/22_locale/moneypunct_byname/1.cc: Same.
* testsuite/22_locale/num_get/get/char/1.cc: Same.
* testsuite/22_locale/num_get/get/char/2.cc: Same.
* testsuite/22_locale/num_get/get/char/3.cc: Same.
* testsuite/22_locale/num_get/get/char/5.cc: Same.
* testsuite/22_locale/num_get/get/char/6.cc: Same.
* testsuite/22_locale/num_get/get/wchar_t/1.cc: Same.
* testsuite/22_locale/num_get/get/wchar_t/2.cc: Same.
* testsuite/22_locale/num_get/get/wchar_t/3.cc: Same.
* testsuite/22_locale/num_get/get/wchar_t/5.cc: Same.
* testsuite/22_locale/num_get/get/wchar_t/6.cc: Same.
* testsuite/22_locale/num_put/put/char/1.cc: Same.
* testsuite/22_locale/num_put/put/char/2.cc: Same.
* testsuite/22_locale/num_put/put/char/3.cc: Same.
* testsuite/22_locale/num_put/put/char/5.cc: Same.
* testsuite/22_locale/num_put/put/wchar_t/1.cc: Same.
* testsuite/22_locale/num_put/put/wchar_t/2.cc: Same.
* testsuite/22_locale/num_put/put/wchar_t/3.cc: Same.
* testsuite/22_locale/num_put/put/wchar_t/5.cc: Same.
* testsuite/22_locale/numpunct/members/char/1.cc: Same.
* testsuite/22_locale/numpunct/members/char/2.cc: Same.
* testsuite/22_locale/numpunct/members/wchar_t/1.cc: Same.
* testsuite/22_locale/numpunct/members/wchar_t/2.cc: Same.
* testsuite/22_locale/numpunct_byname/1.cc: Same.
* testsuite/22_locale/numpunct_byname/2.cc: Same.
* testsuite/22_locale/time_get/date_order/char/1.cc: Same.
* testsuite/22_locale/time_get/date_order/wchar_t/1.cc: Same.
* testsuite/22_locale/time_get/get_date/char/1.cc: Same.
* testsuite/22_locale/time_get/get_date/char/2.cc: Same.
* testsuite/22_locale/time_get/get_date/wchar_t/1.cc: Same.
* testsuite/22_locale/time_get/get_date/wchar_t/2.cc: Same.
* testsuite/22_locale/time_get/get_monthname/char/1.cc: Same.
* testsuite/22_locale/time_get/get_monthname/char/2.cc: Same.
* testsuite/22_locale/time_get/get_monthname/wchar_t/1.cc: Same.
* testsuite/22_locale/time_get/get_monthname/wchar_t/2.cc: Same.
* testsuite/22_locale/time_get/get_time/char/1.cc: Same.
* testsuite/22_locale/time_get/get_time/char/2.cc: Same.
* testsuite/22_locale/time_get/get_time/wchar_t/1.cc: Same.
* testsuite/22_locale/time_get/get_time/wchar_t/2.cc: Same.
* testsuite/22_locale/time_get/get_weekday/char/1.cc: Same.
* testsuite/22_locale/time_get/get_weekday/char/2.cc: Same.
* testsuite/22_locale/time_get/get_weekday/wchar_t/1.cc: Same.
* testsuite/22_locale/time_get/get_weekday/wchar_t/2.cc: Same.
* testsuite/22_locale/time_get/get_year/char/1.cc: Same.
* testsuite/22_locale/time_get/get_year/wchar_t/1.cc: Same.
* testsuite/22_locale/time_put/put/char/1.cc: Same.
* testsuite/22_locale/time_put/put/char/2.cc: Same.
* testsuite/22_locale/time_put/put/char/3.cc: Same.
* testsuite/22_locale/time_put/put/char/4.cc: Same.
* testsuite/22_locale/time_put/put/char/5.cc: Same.
* testsuite/22_locale/time_put/put/char/6.cc: Same.
* testsuite/22_locale/time_put/put/char/7.cc: Same.
* testsuite/22_locale/time_put/put/char/8.cc: Same.
* testsuite/22_locale/time_put/put/wchar_t/1.cc: Same.
* testsuite/22_locale/time_put/put/wchar_t/2.cc: Same.
* testsuite/22_locale/time_put/put/wchar_t/3.cc: Same.
* testsuite/22_locale/time_put/put/wchar_t/4.cc: Same.
* testsuite/22_locale/time_put/put/wchar_t/5.cc: Same.
* testsuite/22_locale/time_put/put/wchar_t/6.cc: Same.
* testsuite/22_locale/time_put/put/wchar_t/7.cc: Same.
* testsuite/22_locale/time_put/put/wchar_t/8.cc: Same.
* testsuite/27_io/basic_filebuf/imbue/char/9322.cc: Same.
* testsuite/27_io/basic_ios/copyfmt/char/2.cc: Same.
* testsuite/27_io/basic_ostream/inserters_arithmetic/char/2.cc: Same.
* testsuite/27_io/basic_streambuf/imbue/char/9322.cc: Same.
* testsuite/27_io/basic_stringbuf/imbue/char/9322.cc: Same.
2003-04-14 Andreas Tobler <toa@pop.agri.ch>
* configure.target (_cpu_incdir_fullpath): Solaris 2.9 uses
solaris includes, not generic.
2003-04-14 Loren J. Rittle <ljrittle@acm.org> 2003-04-14 Loren J. Rittle <ljrittle@acm.org>
* testsuite/26_numerics/c99_classification_macros_c.cc: Add XFAIL. * testsuite/26_numerics/c99_classification_macros_c.cc: Add XFAIL.
......
libstdc++-v3/config/locale/generic/c_locale.cc
// Wrapper for underlying C-language localization -*- C++ -*- // Wrapper for underlying C-language localization -*- C++ -*-
// Copyright (C) 2001, 2002 Free Software Foundation, Inc. // Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -216,7 +216,7 @@ namespace std ...@@ -216,7 +216,7 @@ namespace std
__c_locale) __c_locale)
{ {
__cloc = NULL; __cloc = NULL;
if (strcmp (__s, "C")) if (strcmp(__s, "C"))
__throw_runtime_error("attempt to create locale from unhandled name in generic implementation; see http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html"); __throw_runtime_error("attempt to create locale from unhandled name in generic implementation; see http://gcc.gnu.org/ml/libstdc++/2003-02/msg00345.html");
} }
......
libstdc++-v3/config/os/generic/ctype_inline.h
// Locale support -*- C++ -*- // Locale support -*- C++ -*-
// Copyright (C) 2000 Free Software Foundation, Inc. // Copyright (C) 2000, 2003 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -39,69 +39,95 @@ ...@@ -39,69 +39,95 @@
// functionality should be added for the native os in question: see // functionality should be added for the native os in question: see
// the config/os/bits/ctype_*.h files. // the config/os/bits/ctype_*.h files.
// Constructing a synthetic "C" table should be seriously considered...
bool bool
ctype<char>:: ctype<char>::
is(mask __m, char __c) const is(mask __m, char __c) const
{ {
bool __ret; if (_M_table)
switch (__m) return _M_table[static_cast<unsigned char>(__c)] & __m;
else
{ {
case space: bool __ret = true;
__ret = isspace(__c); const int __bitmasksize = 11;
break; int __bitcur = 0; // Lowest bitmask in ctype_base == 0
case print: for (;__ret && __bitcur < __bitmasksize; ++__bitcur)
__ret = isprint(__c); {
break; mask __bit = static_cast<mask>(1 << __bitcur);
case cntrl: if (__m & __bit)
__ret = iscntrl(__c); {
break; bool __testis;
case upper: switch (__bit)
__ret = isupper(__c); {
break; case space:
case lower: __testis = isspace(__c);
__ret = islower(__c); break;
break; case print:
case alpha: __testis = isprint(__c);
__ret = isalpha(__c); break;
break; case cntrl:
case digit: __testis = iscntrl(__c);
__ret = isdigit(__c); break;
break; case upper:
case punct: __testis = isupper(__c);
__ret = ispunct(__c); break;
break; case lower:
case xdigit: __testis = islower(__c);
__ret = isxdigit(__c); break;
break; case alpha:
case alnum: __testis = isalpha(__c);
__ret = isalnum(__c); break;
break; case digit:
case graph: __testis = isdigit(__c);
__ret = isgraph(__c); break;
break; case punct:
default: __testis = ispunct(__c);
__ret = false; break;
break; case xdigit:
__testis = isxdigit(__c);
break;
case alnum:
__testis = isalnum(__c);
break;
case graph:
__testis = isgraph(__c);
break;
default:
__testis = false;
break;
}
__ret &= __testis;
}
}
return __ret;
} }
return __ret;
} }
const char* const char*
ctype<char>:: ctype<char>::
is(const char* __low, const char* __high, mask* __vec) const is(const char* __low, const char* __high, mask* __vec) const
{ {
const int __bitmasksize = 11; // Highest bitmask in ctype_base == 10 if (_M_table)
for (;__low < __high; ++__vec, ++__low) while (__low < __high)
*__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
else
{ {
mask __m = 0; // Highest bitmask in ctype_base == 10.
int __i = 0; // Lowest bitmask in ctype_base == 0 const int __bitmasksize = 11;
for (;__i < __bitmasksize; ++__i) for (;__low < __high; ++__vec, ++__low)
{ {
mask __bit = static_cast<mask>(1 << __i); mask __m = 0;
if (this->is(__bit, *__low)) // Lowest bitmask in ctype_base == 0
__m |= __bit; int __i = 0;
for (;__i < __bitmasksize; ++__i)
{
mask __bit = static_cast<mask>(1 << __i);
if (this->is(__bit, *__low))
__m |= __bit;
}
*__vec = __m;
} }
*__vec = __m;
} }
return __high; return __high;
} }
...@@ -110,8 +136,13 @@ ...@@ -110,8 +136,13 @@
ctype<char>:: ctype<char>::
scan_is(mask __m, const char* __low, const char* __high) const scan_is(mask __m, const char* __low, const char* __high) const
{ {
while (__low < __high && !this->is(__m, *__low)) if (_M_table)
++__low; while (__low < __high
&& !(_M_table[static_cast<unsigned char>(*__low)] & __m))
++__low;
else
while (__low < __high && !this->is(__m, *__low))
++__low;
return __low; return __low;
} }
...@@ -119,7 +150,12 @@ ...@@ -119,7 +150,12 @@
ctype<char>:: ctype<char>::
scan_not(mask __m, const char* __low, const char* __high) const scan_not(mask __m, const char* __low, const char* __high) const
{ {
while (__low < __high && this->is(__m, *__low) != 0) if (_M_table)
++__low; while (__low < __high
&& (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
++__low;
else
while (__low < __high && this->is(__m, *__low) != 0)
++__low;
return __low; return __low;
} }
libstdc++-v3/configure.target
...@@ -166,7 +166,7 @@ case "${target_os}" in ...@@ -166,7 +166,7 @@ case "${target_os}" in
solaris2.6*) solaris2.6*)
os_include_dir="os/solaris/solaris2.6" os_include_dir="os/solaris/solaris2.6"
;; ;;
solaris2.[78]*) solaris2.[789]*)
os_include_dir="os/solaris/solaris2.7" os_include_dir="os/solaris/solaris2.7"
;; ;;
windiss*) windiss*)
......
libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/2.cc
...@@ -33,7 +33,7 @@ void test02() ...@@ -33,7 +33,7 @@ void test02()
bool test = true; bool test = true;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/3.cc
...@@ -33,7 +33,7 @@ void test03() ...@@ -33,7 +33,7 @@ void test03()
bool test = true; bool test = true;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
locale loc ("en_US.ISO-8859-15"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/always_noconv/wchar_t/4.cc
...@@ -33,7 +33,7 @@ void test04() ...@@ -33,7 +33,7 @@ void test04()
bool test = true; bool test = true;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/2.cc
...@@ -33,7 +33,7 @@ void test02() ...@@ -33,7 +33,7 @@ void test02()
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
bool test = true; bool test = true;
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/3.cc
...@@ -33,7 +33,7 @@ void test03() ...@@ -33,7 +33,7 @@ void test03()
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
bool test = true; bool test = true;
locale loc ("en_US.ISO-8859-15"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/encoding/wchar_t/4.cc
...@@ -33,7 +33,7 @@ void test04() ...@@ -33,7 +33,7 @@ void test04()
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
bool test = true; bool test = true;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/2.cc
...@@ -88,7 +88,7 @@ void test02() ...@@ -88,7 +88,7 @@ void test02()
wmemset(i_ref, 0xdeadbeef, size + 1); wmemset(i_ref, 0xdeadbeef, size + 1);
int_type* ito_next; int_type* ito_next;
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/3.cc
...@@ -102,7 +102,7 @@ void test03() ...@@ -102,7 +102,7 @@ void test03()
wmemset(i_ref, 0xdeadbeef, size + 1); wmemset(i_ref, 0xdeadbeef, size + 1);
int_type* ito_next; int_type* ito_next;
locale loc ("en_US.ISO-8859-15"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/4.cc
...@@ -110,7 +110,7 @@ void test04() ...@@ -110,7 +110,7 @@ void test04()
wmemset(i_ref, 0xdeadbeef, esize + 1); wmemset(i_ref, 0xdeadbeef, esize + 1);
int_type* ito_next; int_type* ito_next;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/7.cc
...@@ -60,7 +60,7 @@ void test07() ...@@ -60,7 +60,7 @@ void test07()
wmemset(i_ref, 0xdeadbeef, size + 1); wmemset(i_ref, 0xdeadbeef, size + 1);
int_type* ito_next; int_type* ito_next;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/8.cc
...@@ -109,7 +109,7 @@ void test08() ...@@ -109,7 +109,7 @@ void test08()
wmemset(i_ref, 0xdeadbeef, esize + 1); wmemset(i_ref, 0xdeadbeef, esize + 1);
int_type* ito_next; int_type* ito_next;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/in/wchar_t/9.cc
...@@ -111,7 +111,7 @@ void test09() ...@@ -111,7 +111,7 @@ void test09()
int_type* ito = i_arr; int_type* ito = i_arr;
int_type* ito_next; int_type* ito_next;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/2.cc
...@@ -61,7 +61,7 @@ void test02() ...@@ -61,7 +61,7 @@ void test02()
"\xff"; "\xff";
int size = strlen(e_lit); int size = strlen(e_lit);
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/3.cc
...@@ -61,7 +61,7 @@ void test03() ...@@ -61,7 +61,7 @@ void test03()
"\xff"; "\xff";
int size = strlen(e_lit); int size = strlen(e_lit);
locale loc ("en_US.ISO-8859-15"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/4.cc
...@@ -100,7 +100,7 @@ void test04() ...@@ -100,7 +100,7 @@ void test04()
int esize = strlen(e_lit); int esize = strlen(e_lit);
int isize = wcslen(i_lit); int isize = wcslen(i_lit);
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/length/wchar_t/7.cc
...@@ -52,7 +52,7 @@ void test07() ...@@ -52,7 +52,7 @@ void test07()
const ext_type* efrom_next; const ext_type* efrom_next;
int size = strlen(e_lit); int size = strlen(e_lit);
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/2.cc
...@@ -31,7 +31,7 @@ void test02() ...@@ -31,7 +31,7 @@ void test02()
bool test = true; bool test = true;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/3.cc
...@@ -31,7 +31,7 @@ void test03() ...@@ -31,7 +31,7 @@ void test03()
bool test = true; bool test = true;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
locale loc ("en_US.ISO-8859-15"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/max_length/wchar_t/4.cc
...@@ -31,7 +31,7 @@ void test04() ...@@ -31,7 +31,7 @@ void test04()
bool test = true; bool test = true;
typedef codecvt<wchar_t, char, mbstate_t> w_codecvt; typedef codecvt<wchar_t, char, mbstate_t> w_codecvt;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/2.cc
...@@ -86,7 +86,7 @@ void test02() ...@@ -86,7 +86,7 @@ void test02()
memset(e_ref, 0xf0, size + 1); memset(e_ref, 0xf0, size + 1);
ext_type* eto_next; ext_type* eto_next;
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/3.cc
...@@ -100,7 +100,7 @@ void test03() ...@@ -100,7 +100,7 @@ void test03()
memset(e_ref, 0xf0, size + 1); memset(e_ref, 0xf0, size + 1);
ext_type* eto_next; ext_type* eto_next;
locale loc ("en_US.ISO-8859-15"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/4.cc
...@@ -107,7 +107,7 @@ void test04() ...@@ -107,7 +107,7 @@ void test04()
memset(e_ref, 0xf0, esize + 1); memset(e_ref, 0xf0, esize + 1);
ext_type* eto_next; ext_type* eto_next;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/out/wchar_t/7.cc
...@@ -58,7 +58,7 @@ void test03() ...@@ -58,7 +58,7 @@ void test03()
memset(e_ref, 0xf0, size + 1); memset(e_ref, 0xf0, size + 1);
ext_type* eto_next; ext_type* eto_next;
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/2.cc
...@@ -71,7 +71,7 @@ void test02() ...@@ -71,7 +71,7 @@ void test02()
memset(e_ref, 0xf0, size + 1); memset(e_ref, 0xf0, size + 1);
ext_type* eto_next; ext_type* eto_next;
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/3.cc
...@@ -85,7 +85,7 @@ void test03() ...@@ -85,7 +85,7 @@ void test03()
memset(e_ref, 0xf0, size + 1); memset(e_ref, 0xf0, size + 1);
ext_type* eto_next; ext_type* eto_next;
locale loc ("en_US.ISO-8859-15"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-15");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/codecvt/unshift/wchar_t/4.cc
...@@ -80,7 +80,7 @@ void test04() ...@@ -80,7 +80,7 @@ void test04()
memset(e_ref, 0xf0, size + 1); memset(e_ref, 0xf0, size + 1);
ext_type* eto_next; ext_type* eto_next;
locale loc ("en_US.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("en_US.UTF-8");
locale::global(loc); locale::global(loc);
const w_codecvt* cvt = &use_facet<w_codecvt>(loc); const w_codecvt* cvt = &use_facet<w_codecvt>(loc);
......
libstdc++-v3/testsuite/22_locale/collate/compare/char/1.cc
...@@ -33,9 +33,9 @@ void test01() ...@@ -33,9 +33,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -74,6 +74,6 @@ void test01() ...@@ -74,6 +74,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/collate/compare/char/2.cc
...@@ -33,9 +33,9 @@ void test02() ...@@ -33,9 +33,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -81,6 +81,6 @@ void test02() ...@@ -81,6 +81,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/collate/compare/char/3.cc
...@@ -33,7 +33,7 @@ void test03() ...@@ -33,7 +33,7 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
// cache the collate facets // cache the collate facets
...@@ -85,6 +85,6 @@ void test03() ...@@ -85,6 +85,6 @@ void test03()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test03); test03();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/1.cc
...@@ -33,9 +33,9 @@ void test01() ...@@ -33,9 +33,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
......
libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc
...@@ -33,9 +33,9 @@ void test02() ...@@ -33,9 +33,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
......
libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/3.cc
...@@ -33,7 +33,7 @@ void test03() ...@@ -33,7 +33,7 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
// cache the collate facets // cache the collate facets
......
libstdc++-v3/testsuite/22_locale/collate/hash/char/2.cc
...@@ -33,9 +33,9 @@ void test02() ...@@ -33,9 +33,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -70,6 +70,6 @@ void test02() ...@@ -70,6 +70,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
...@@ -32,9 +32,9 @@ void test02() ...@@ -32,9 +32,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
......
libstdc++-v3/testsuite/22_locale/collate/transform/char/2.cc
...@@ -32,9 +32,9 @@ void test02() ...@@ -32,9 +32,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -67,6 +67,6 @@ void test02() ...@@ -67,6 +67,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/collate/transform/char/3.cc
...@@ -32,7 +32,7 @@ void test03() ...@@ -32,7 +32,7 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
// cache the collate facets // cache the collate facets
...@@ -88,6 +88,6 @@ void test03() ...@@ -88,6 +88,6 @@ void test03()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test03); test03();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc
...@@ -32,9 +32,9 @@ void test02() ...@@ -32,9 +32,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
......
libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/3.cc
...@@ -32,7 +32,7 @@ void test03() ...@@ -32,7 +32,7 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
// cache the collate facets // cache the collate facets
......
libstdc++-v3/testsuite/22_locale/collate_byname/1.cc
...@@ -32,12 +32,12 @@ void test01() ...@@ -32,12 +32,12 @@ void test01()
string str; string str;
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_de = __gnu_cxx_test::try_named_locale("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>("de_DE"));
str = loc_byname.name(); str = loc_byname.name();
locale loc_de("de_DE");
str = loc_de.name();
VERIFY( loc_de != loc_byname ); VERIFY( loc_de != loc_byname );
// cache the collate facets // cache the collate facets
...@@ -131,6 +131,6 @@ void test01() ...@@ -131,6 +131,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/ctype/is/char/2.cc
...@@ -67,7 +67,7 @@ void test02() ...@@ -67,7 +67,7 @@ void test02()
} }
// "de_DE" // "de_DE"
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
const ctype<char>& ctype_de = use_facet<ctype<char> >(loc_de); const ctype<char>& ctype_de = use_facet<ctype<char> >(loc_de);
for (int i = 0; i < max; ++i) for (int i = 0; i < max; ++i)
{ {
...@@ -99,6 +99,6 @@ void test02() ...@@ -99,6 +99,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/ctype/is/wchar_t/2.cc
...@@ -67,7 +67,7 @@ void test02() ...@@ -67,7 +67,7 @@ void test02()
} }
// "de_DE" // "de_DE"
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
const ctype<wchar_t>& ctype_de = use_facet<ctype<wchar_t> >(loc_de); const ctype<wchar_t>& ctype_de = use_facet<ctype<wchar_t> >(loc_de);
for (int i = 0; i < max; ++i) for (int i = 0; i < max; ++i)
{ {
......
libstdc++-v3/testsuite/22_locale/ctype/narrow/wchar_t/3.cc
...@@ -38,7 +38,7 @@ void test03() ...@@ -38,7 +38,7 @@ void test03()
using namespace std; using namespace std;
bool test = true; bool test = true;
locale loc ("se_NO.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("se_NO.UTF-8");
const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc); const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
const wchar_t* wstrlit = L"\x80"; const wchar_t* wstrlit = L"\x80";
......
libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/2.cc
...@@ -38,7 +38,7 @@ void test02() ...@@ -38,7 +38,7 @@ void test02()
using namespace std; using namespace std;
bool test = true; bool test = true;
locale loc ("en_US.ISO-8859-1"); locale loc = __gnu_cxx_test::try_named_locale("en_US.ISO-8859-1");
const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc); const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
char c = 0xff; char c = 0xff;
......
libstdc++-v3/testsuite/22_locale/ctype/widen/wchar_t/3.cc
...@@ -38,7 +38,7 @@ void test03() ...@@ -38,7 +38,7 @@ void test03()
using namespace std; using namespace std;
bool test = true; bool test = true;
locale loc ("se_NO.UTF-8"); locale loc = __gnu_cxx_test::try_named_locale("se_NO.UTF-8");
const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc); const ctype<wchar_t>& wct = use_facet<ctype<wchar_t> >(loc);
const char* strlit = "\xc2\x80"; const char* strlit = "\xc2\x80";
......
libstdc++-v3/testsuite/22_locale/facet/2.cc
...@@ -83,12 +83,12 @@ void test02() ...@@ -83,12 +83,12 @@ void test02()
// 4: Named locale should destroy facets when it goes out of scope. // 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. // Not quite sure how to test for this w/o valgrind at the moment.
{ {
locale loc03("es_MX"); locale loc03 = __gnu_cxx_test::try_named_locale("es_MX");
} }
} }
int main () int main ()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/locale/cons/2.cc
...@@ -80,7 +80,7 @@ namespace std ...@@ -80,7 +80,7 @@ namespace std
static char_type* static char_type*
copy(char_type* __s1, const char_type* __s2, size_t __n) copy(char_type* __s1, const char_type* __s2, size_t __n)
{ return static_cast<char_type*>(memcpy(__s1, __s2, __n)); } { return static_cast<char_type*>(memcpy(__s1, __s2, __n)); }
static char_type* static char_type*
assign(char_type* __s, size_t __n, char_type __a); assign(char_type* __s, size_t __n, char_type __a);
...@@ -170,7 +170,7 @@ void test01() ...@@ -170,7 +170,7 @@ void test01()
// 3 // 3
// explicit locale(const char* std_name) // explicit locale(const char* std_name)
locale loc06("fr_FR"); locale loc06 = __gnu_cxx_test::try_named_locale("fr_FR");
VERIFY (loc06 != loc01); VERIFY (loc06 != loc01);
VERIFY (loc06 != loc02); VERIFY (loc06 != loc02);
VERIFY (loc06.name() == "fr_FR"); VERIFY (loc06.name() == "fr_FR");
......
libstdc++-v3/testsuite/22_locale/locale/cons/4.cc
...@@ -33,7 +33,7 @@ void test03() ...@@ -33,7 +33,7 @@ void test03()
const char* LC_ALL_orig = getenv("LC_ALL"); const char* LC_ALL_orig = getenv("LC_ALL");
if (!setenv("LC_ALL", "it_IT", 1)) if (!setenv("LC_ALL", "it_IT", 1))
{ {
std::locale loc(""); std::locale loc = __gnu_cxx_test::try_named_locale("");
VERIFY( loc.name() == "it_IT" ); VERIFY( loc.name() == "it_IT" );
setenv("LC_ALL", LC_ALL_orig ? LC_ALL_orig : "", 1); setenv("LC_ALL", LC_ALL_orig ? LC_ALL_orig : "", 1);
} }
...@@ -42,6 +42,6 @@ void test03() ...@@ -42,6 +42,6 @@ void test03()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test03); test03();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/locale/cons/5.cc
...@@ -65,7 +65,7 @@ void test04() ...@@ -65,7 +65,7 @@ void test04()
// Check that a "POSIX" LC_ALL is equivalent to "C". // Check that a "POSIX" LC_ALL is equivalent to "C".
if (!setenv("LC_ALL", "POSIX", 1)) if (!setenv("LC_ALL", "POSIX", 1))
{ {
locale loc(""); locale loc = __gnu_cxx_test::try_named_locale("");
VERIFY( loc.name() == "C" ); VERIFY( loc.name() == "C" );
} }
setenv("LC_ALL", "", 1); setenv("LC_ALL", "", 1);
...@@ -73,7 +73,7 @@ void test04() ...@@ -73,7 +73,7 @@ void test04()
// Check that a "en_PH" LC_ALL is equivalent to "en_PH". // Check that a "en_PH" LC_ALL is equivalent to "en_PH".
if (!setenv("LC_ALL", "en_PH", 1)) if (!setenv("LC_ALL", "en_PH", 1))
{ {
locale loc(""); locale loc = __gnu_cxx_test::try_named_locale("");
VERIFY( loc.name() == "en_PH" ); VERIFY( loc.name() == "en_PH" );
} }
setenv("LC_ALL", "", 1); setenv("LC_ALL", "", 1);
...@@ -83,7 +83,7 @@ void test04() ...@@ -83,7 +83,7 @@ void test04()
{ {
if (!setenv("LC_ALL", "en_PH", 1)) if (!setenv("LC_ALL", "en_PH", 1))
{ {
locale loc(""); locale loc = __gnu_cxx_test::try_named_locale("");
VERIFY( loc.name() == "en_PH" ); VERIFY( loc.name() == "en_PH" );
} }
setenv("LC_ALL", "", 1); setenv("LC_ALL", "", 1);
...@@ -112,7 +112,7 @@ void test04() ...@@ -112,7 +112,7 @@ void test04()
// Check the default set by LANG. // Check the default set by LANG.
if (!setenv("LANG", "fr_FR", 1)) if (!setenv("LANG", "fr_FR", 1))
{ {
locale loc(""); locale loc = __gnu_cxx_test::try_named_locale("");
VERIFY( loc.name() == "fr_FR" ); VERIFY( loc.name() == "fr_FR" );
} }
...@@ -126,7 +126,7 @@ void test04() ...@@ -126,7 +126,7 @@ void test04()
// Setting a category in the "C" default. // Setting a category in the "C" default.
if (!setenv("LC_COLLATE", "de_DE", 1)) if (!setenv("LC_COLLATE", "de_DE", 1))
{ {
locale loc(""); locale loc = __gnu_cxx_test::try_named_locale("");
#if _GLIBCPP_NUM_CATEGORIES #if _GLIBCPP_NUM_CATEGORIES
VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;" VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;"
...@@ -142,7 +142,7 @@ void test04() ...@@ -142,7 +142,7 @@ void test04()
// Changing the LANG default while LC_COLLATE is set. // Changing the LANG default while LC_COLLATE is set.
if (!setenv("LANG", "fr_FR", 1)) if (!setenv("LANG", "fr_FR", 1))
{ {
locale loc(""); locale loc = __gnu_cxx_test::try_named_locale("");
#if _GLIBCPP_NUM_CATEGORIES #if _GLIBCPP_NUM_CATEGORIES
VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;" VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;"
"LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;" "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;"
...@@ -160,7 +160,7 @@ void test04() ...@@ -160,7 +160,7 @@ void test04()
#if _GLIBCPP_NUM_CATEGORIES #if _GLIBCPP_NUM_CATEGORIES
if (!setenv("LC_IDENTIFICATION", "it_IT", 1)) if (!setenv("LC_IDENTIFICATION", "it_IT", 1))
{ {
locale loc(""); locale loc = __gnu_cxx_test::try_named_locale("");
VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;" VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;"
"LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;" "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;"
"LC_MESSAGES=fr_FR;LC_PAPER=fr_FR;LC_NAME=fr_FR;" "LC_MESSAGES=fr_FR;LC_PAPER=fr_FR;LC_NAME=fr_FR;"
...@@ -193,6 +193,6 @@ void test04() ...@@ -193,6 +193,6 @@ void test04()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test04); test04();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/locale/cons/7.cc
...@@ -35,9 +35,9 @@ test02() ...@@ -35,9 +35,9 @@ test02()
// construct a locale object with the specialized facet. // construct a locale object with the specialized facet.
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_1(locale::classic(), locale loc_1(locale::classic(),
new numpunct_byname<char>("fr_FR")); new numpunct_byname<char>("fr_FR"));
locale loc_fr("fr_FR");
// check names // check names
VERIFY( loc_c.name() == name_c ); VERIFY( loc_c.name() == name_c );
...@@ -99,6 +99,6 @@ test02() ...@@ -99,6 +99,6 @@ test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/locale/cons/7222-c.cc
...@@ -31,7 +31,7 @@ void test02() ...@@ -31,7 +31,7 @@ void test02()
bool test = true; bool test = true;
std::locale loc_c1("C"); std::locale loc_c1("C");
std::locale loc_c2 ("C"); std::locale loc_c2("C");
VERIFY( loc_c1 == loc_c2 ); VERIFY( loc_c1 == loc_c2 );
} }
......
libstdc++-v3/testsuite/22_locale/locale/cons/7222-env.cc
...@@ -30,13 +30,13 @@ void test02() ...@@ -30,13 +30,13 @@ void test02()
{ {
bool test = true; bool test = true;
std::locale loc_1(""); std::locale loc_1 = __gnu_cxx_test::try_named_locale("");
std::locale loc_2(""); std::locale loc_2 = __gnu_cxx_test::try_named_locale("");
VERIFY( loc_1 == loc_2 ); VERIFY( loc_1 == loc_2 );
} }
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/locale/global_locale_objects/2.cc
...@@ -42,13 +42,13 @@ void test02() ...@@ -42,13 +42,13 @@ void test02()
// named locales work. // named locales work.
if (testph && testmx) if (testph && testmx)
{ {
const locale loc_ph(ph.c_str()); const locale loc_ph = __gnu_cxx_test::try_named_locale(ph.c_str());
const locale loc_mx(mx.c_str()); const locale loc_mx = __gnu_cxx_test::try_named_locale(mx.c_str());
// Use setlocale between two calls to locale("") // Use setlocale between two calls to locale("")
const locale loc_env_1(""); const locale loc_env_1 = __gnu_cxx_test::try_named_locale("");
setlocale(LC_ALL, ph.c_str()); setlocale(LC_ALL, ph.c_str());
const locale loc_env_2(""); const locale loc_env_2 = __gnu_cxx_test::try_named_locale("");
VERIFY( loc_env_1 == loc_env_2 ); VERIFY( loc_env_1 == loc_env_2 );
// Change global locale. // Change global locale.
......
libstdc++-v3/testsuite/22_locale/messages/members/char/1.cc
...@@ -35,9 +35,9 @@ void test01() ...@@ -35,9 +35,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -64,6 +64,6 @@ void test01() ...@@ -64,6 +64,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/messages/members/char/2.cc
...@@ -35,9 +35,9 @@ void test02() ...@@ -35,9 +35,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -64,6 +64,6 @@ void test02() ...@@ -64,6 +64,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/messages/members/char/3.cc
...@@ -35,9 +35,9 @@ void test03() ...@@ -35,9 +35,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -64,6 +64,6 @@ void test03() ...@@ -64,6 +64,6 @@ void test03()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test03); test03();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/messages_byname/1.cc
...@@ -35,12 +35,12 @@ void test01() ...@@ -35,12 +35,12 @@ void test01()
const char* dir = LOCALEDIR; const char* dir = LOCALEDIR;
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_de = __gnu_cxx_test::try_named_locale("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>("de_DE"));
str = loc_byname.name(); str = loc_byname.name();
locale loc_de("de_DE");
str = loc_de.name();
VERIFY( loc_de != loc_byname ); VERIFY( loc_de != loc_byname );
// cache the messages facets // cache the messages facets
...@@ -73,6 +73,6 @@ void test01() ...@@ -73,6 +73,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/money_get/get/char/1.cc
...@@ -36,9 +36,9 @@ void test01() ...@@ -36,9 +36,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -146,6 +146,6 @@ void test01() ...@@ -146,6 +146,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/money_get/get/char/2.cc
...@@ -36,9 +36,9 @@ void test02() ...@@ -36,9 +36,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -135,6 +135,6 @@ void test02() ...@@ -135,6 +135,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/money_get/get/char/3.cc
...@@ -36,9 +36,9 @@ void test03() ...@@ -36,9 +36,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -91,6 +91,6 @@ void test03() ...@@ -91,6 +91,6 @@ void test03()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test03); test03();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/money_get/get/char/4.cc
...@@ -36,9 +36,9 @@ void test04() ...@@ -36,9 +36,9 @@ void test04()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -86,6 +86,6 @@ void test04() ...@@ -86,6 +86,6 @@ void test04()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test04); test04();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/1.cc
...@@ -36,9 +36,9 @@ void test01() ...@@ -36,9 +36,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/2.cc
...@@ -36,9 +36,9 @@ void test02() ...@@ -36,9 +36,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/3.cc
...@@ -36,9 +36,9 @@ void test03() ...@@ -36,9 +36,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/money_get/get/wchar_t/4.cc
...@@ -36,9 +36,9 @@ void test04() ...@@ -36,9 +36,9 @@ void test04()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/money_put/put/char/1.cc
...@@ -36,9 +36,9 @@ void test01() ...@@ -36,9 +36,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -124,6 +124,6 @@ void test01() ...@@ -124,6 +124,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/money_put/put/char/2.cc
...@@ -36,9 +36,9 @@ void test02() ...@@ -36,9 +36,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -115,6 +115,6 @@ void test02() ...@@ -115,6 +115,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/money_put/put/char/3.cc
...@@ -36,9 +36,9 @@ void test03() ...@@ -36,9 +36,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -104,6 +104,6 @@ void test03() ...@@ -104,6 +104,6 @@ void test03()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test03); test03();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/1.cc
...@@ -36,9 +36,9 @@ void test01() ...@@ -36,9 +36,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/2.cc
...@@ -36,9 +36,9 @@ void test02() ...@@ -36,9 +36,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/money_put/put/wchar_t/3.cc
...@@ -36,9 +36,9 @@ void test03() ...@@ -36,9 +36,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE@euro"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE@euro");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/moneypunct/members/char/2.cc
...@@ -34,7 +34,7 @@ void test02() ...@@ -34,7 +34,7 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
// cache the moneypunct facets // cache the moneypunct facets
typedef moneypunct<char, true> __money_true; typedef moneypunct<char, true> __money_true;
...@@ -95,6 +95,6 @@ void test02() ...@@ -95,6 +95,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/moneypunct/members/wchar_t/2.cc
...@@ -34,7 +34,7 @@ void test02() ...@@ -34,7 +34,7 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
// cache the moneypunct facets // cache the moneypunct facets
typedef moneypunct<wchar_t, true> __money_true; typedef moneypunct<wchar_t, true> __money_true;
......
libstdc++-v3/testsuite/22_locale/moneypunct_byname/1.cc
...@@ -32,12 +32,12 @@ void test01() ...@@ -32,12 +32,12 @@ void test01()
bool test = true; bool test = true;
string str; string str;
locale loc_de = __gnu_cxx_test::try_named_locale("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>("de_DE"));
str = loc_byname.name(); str = loc_byname.name();
locale loc_de("de_DE");
str = loc_de.name();
locale loc_c = locale::classic(); locale loc_c = locale::classic();
VERIFY( loc_de != loc_byname ); VERIFY( loc_de != loc_byname );
...@@ -93,7 +93,6 @@ void test01() ...@@ -93,7 +93,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/num_get/get/char/1.cc
...@@ -33,9 +33,9 @@ void test01() ...@@ -33,9 +33,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -162,7 +162,7 @@ void test01() ...@@ -162,7 +162,7 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_get/get/char/2.cc
...@@ -33,9 +33,9 @@ void test02() ...@@ -33,9 +33,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -132,7 +132,7 @@ void test02() ...@@ -132,7 +132,7 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_get/get/char/3.cc
...@@ -33,9 +33,9 @@ void test03() ...@@ -33,9 +33,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -94,7 +94,7 @@ void test03() ...@@ -94,7 +94,7 @@ void test03()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test03); test03();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_get/get/char/5.cc
...@@ -36,7 +36,7 @@ void test05() ...@@ -36,7 +36,7 @@ void test05()
istringstream iss; istringstream iss;
// A locale that expects grouping // A locale that expects grouping
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
iss.imbue(loc_de); iss.imbue(loc_de);
const num_get<char>& ng = use_facet<num_get<char> >(iss.getloc()); const num_get<char>& ng = use_facet<num_get<char> >(iss.getloc());
...@@ -84,7 +84,7 @@ void test05() ...@@ -84,7 +84,7 @@ void test05()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test05); test05();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_get/get/char/6.cc
...@@ -33,7 +33,7 @@ void test06() ...@@ -33,7 +33,7 @@ void test06()
double d = 0.0; double d = 0.0;
istringstream iss; istringstream iss;
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
iss.imbue(loc_de); iss.imbue(loc_de);
const num_get<char>& ng = use_facet<num_get<char> >(iss.getloc()); const num_get<char>& ng = use_facet<num_get<char> >(iss.getloc());
...@@ -49,7 +49,7 @@ void test06() ...@@ -49,7 +49,7 @@ void test06()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test06); test06();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/1.cc
...@@ -33,9 +33,9 @@ void test01() ...@@ -33,9 +33,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/2.cc
...@@ -33,9 +33,9 @@ void test02() ...@@ -33,9 +33,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/3.cc
...@@ -33,9 +33,9 @@ void test03() ...@@ -33,9 +33,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/5.cc
...@@ -36,7 +36,7 @@ void test05() ...@@ -36,7 +36,7 @@ void test05()
wistringstream iss; wistringstream iss;
// A locale that expects grouping // A locale that expects grouping
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
iss.imbue(loc_de); iss.imbue(loc_de);
const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc());
......
libstdc++-v3/testsuite/22_locale/num_get/get/wchar_t/6.cc
...@@ -33,7 +33,7 @@ void test06() ...@@ -33,7 +33,7 @@ void test06()
double d = 0.0; double d = 0.0;
wistringstream iss; wistringstream iss;
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
iss.imbue(loc_de); iss.imbue(loc_de);
const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc()); const num_get<wchar_t>& ng = use_facet<num_get<wchar_t> >(iss.getloc());
......
libstdc++-v3/testsuite/22_locale/num_put/put/char/1.cc
...@@ -33,9 +33,9 @@ void test01() ...@@ -33,9 +33,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -169,7 +169,7 @@ void test01() ...@@ -169,7 +169,7 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_put/put/char/2.cc
...@@ -33,9 +33,9 @@ void test02() ...@@ -33,9 +33,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -105,7 +105,7 @@ void test02() ...@@ -105,7 +105,7 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_put/put/char/3.cc
...@@ -33,9 +33,9 @@ void test03() ...@@ -33,9 +33,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
...@@ -88,7 +88,7 @@ void test03() ...@@ -88,7 +88,7 @@ void test03()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test03); test03();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_put/put/char/5.cc
...@@ -33,7 +33,7 @@ void test05() ...@@ -33,7 +33,7 @@ void test05()
bool test = true; bool test = true;
// A locale that expects grouping. // A locale that expects grouping.
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
const string empty; const string empty;
string result; string result;
...@@ -63,7 +63,7 @@ void test05() ...@@ -63,7 +63,7 @@ void test05()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test05); test05();
return 0; return 0;
} }
......
libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/1.cc
...@@ -33,9 +33,9 @@ void test01() ...@@ -33,9 +33,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/2.cc
...@@ -33,9 +33,9 @@ void test02() ...@@ -33,9 +33,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/3.cc
...@@ -33,9 +33,9 @@ void test03() ...@@ -33,9 +33,9 @@ void test03()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_hk("en_HK"); locale loc_hk = __gnu_cxx_test::try_named_locale("en_HK");
locale loc_fr("fr_FR@euro"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR@euro");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_hk != loc_fr ); VERIFY( loc_hk != loc_fr );
VERIFY( loc_hk != loc_de ); VERIFY( loc_hk != loc_de );
......
libstdc++-v3/testsuite/22_locale/num_put/put/wchar_t/5.cc
...@@ -33,7 +33,7 @@ void test05() ...@@ -33,7 +33,7 @@ void test05()
bool test = true; bool test = true;
// A locale that expects grouping. // A locale that expects grouping.
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
const wstring empty; const wstring empty;
wstring result; wstring result;
......
libstdc++-v3/testsuite/22_locale/numpunct/members/char/1.cc
...@@ -31,9 +31,9 @@ void test01() ...@@ -31,9 +31,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -60,6 +60,6 @@ void test01() ...@@ -60,6 +60,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/numpunct/members/char/2.cc
...@@ -31,9 +31,9 @@ void test02() ...@@ -31,9 +31,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
...@@ -82,6 +82,6 @@ void test02() ...@@ -82,6 +82,6 @@ void test02()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test02); test02();
return 0; return 0;
} }
libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/1.cc
...@@ -31,9 +31,9 @@ void test01() ...@@ -31,9 +31,9 @@ void test01()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
......
libstdc++-v3/testsuite/22_locale/numpunct/members/wchar_t/2.cc
...@@ -31,9 +31,9 @@ void test02() ...@@ -31,9 +31,9 @@ void test02()
// basic construction // basic construction
locale loc_c = locale::classic(); locale loc_c = locale::classic();
locale loc_us("en_US"); locale loc_us = __gnu_cxx_test::try_named_locale("en_US");
locale loc_fr("fr_FR"); locale loc_fr = __gnu_cxx_test::try_named_locale("fr_FR");
locale loc_de("de_DE"); locale loc_de = __gnu_cxx_test::try_named_locale("de_DE");
VERIFY( loc_c != loc_de ); VERIFY( loc_c != loc_de );
VERIFY( loc_us != loc_fr ); VERIFY( loc_us != loc_fr );
VERIFY( loc_us != loc_de ); VERIFY( loc_us != loc_de );
......
libstdc++-v3/testsuite/22_locale/numpunct_byname/1.cc
...@@ -30,12 +30,12 @@ void test01() ...@@ -30,12 +30,12 @@ void test01()
bool test = true; bool test = true;
string str; string str;
locale loc_de = __gnu_cxx_test::try_named_locale("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>("de_DE"));
str = loc_byname.name(); str = loc_byname.name();
locale loc_de("de_DE");
str = loc_de.name();
locale loc_c = locale::classic(); locale loc_c = locale::classic();
VERIFY( loc_de != loc_byname ); VERIFY( loc_de != loc_byname );
...@@ -71,6 +71,6 @@ void test01() ...@@ -71,6 +71,6 @@ void test01()
int main() int main()
{ {
__gnu_cxx_test::run_test_wrapped_generic_locale_exception_catcher(test01); test01();
return 0; return 0;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment