OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

c_locale.cc (locale::_S_categories): Reorder the categories to match that of glibc's setlocale(LC_ALL, ""))

Browse Source 
2002-11-28  Paolo Carlini  <pcarlini@unitus.it>

	* config/locale/gnu/c_locale.cc (locale::_S_categories):
	Reorder the categories to match that of glibc's setlocale(LC_ALL, ""))
	* config/locale/generic/c_locale.cc (locale::_S_categories): Ditto.
	* testsuite/22_locale/ctor_copy_dtor.cc (test04): Tweak.

From-SVN: r59604
This commit is contained in:
Paolo Carlini 2002-11-28 13:25:32 +01:00 committed by Paolo Carlini
parent bcfb713a6f
commit 0e9501e6b1
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2002-11-28 Paolo Carlini <pcarlini@unitus.it>
* config/locale/gnu/c_locale.cc (locale::_S_categories):
Reorder the categories to match that of glibc's setlocale(LC_ALL, ""))
* config/locale/generic/c_locale.cc (locale::_S_categories): Ditto.
* testsuite/22_locale/ctor_copy_dtor.cc (test04): Tweak.
2002-11-25 Benjamin Kosnik <bkoz@redhat.com> 2002-11-25 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/abi_check.cc: Add CXXABI_1.2.1 as compatible. * testsuite/abi_check.cc: Add CXXABI_1.2.1 as compatible.

2
libstdc++-v3/config/locale/generic/c_locale.cc
View File

@ -229,8 +229,8 @@ namespace std
{ {
"LC_CTYPE", "LC_CTYPE",
"LC_NUMERIC", "LC_NUMERIC",
"LC_COLLATE",
"LC_TIME", "LC_TIME",
"LC_COLLATE",
"LC_MONETARY", "LC_MONETARY",
"LC_MESSAGES" "LC_MESSAGES"
}; };

2
libstdc++-v3/config/locale/gnu/c_locale.cc
View File

@ -192,8 +192,8 @@ namespace std
{ {
"LC_CTYPE", "LC_CTYPE",
"LC_NUMERIC", "LC_NUMERIC",
"LC_COLLATE",
"LC_TIME", "LC_TIME",
"LC_COLLATE",
"LC_MONETARY", "LC_MONETARY",
"LC_MESSAGES", "LC_MESSAGES",
"LC_PAPER", "LC_PAPER",

22
libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc
View File

@ -340,10 +340,10 @@ void test04()
getenv("LC_CTYPE") ? strdup(getenv("LC_CTYPE")) : ""; getenv("LC_CTYPE") ? strdup(getenv("LC_CTYPE")) : "";
const char* LC_NUMERIC_orig = const char* LC_NUMERIC_orig =
getenv("LC_NUMERIC") ? strdup(getenv("LC_NUMERIC")) : ""; getenv("LC_NUMERIC") ? strdup(getenv("LC_NUMERIC")) : "";
const char* LC_COLLATE_orig =
getenv("LC_COLLATE") ? strdup(getenv("LC_COLLATE")) : "";
const char* LC_TIME_orig = const char* LC_TIME_orig =
getenv("LC_TIME") ? strdup(getenv("LC_TIME")) : ""; getenv("LC_TIME") ? strdup(getenv("LC_TIME")) : "";
const char* LC_COLLATE_orig =
getenv("LC_COLLATE") ? strdup(getenv("LC_COLLATE")) : "";
const char* LC_MONETARY_orig = const char* LC_MONETARY_orig =
getenv("LC_MONETARY") ? strdup(getenv("LC_MONETARY")) : ""; getenv("LC_MONETARY") ? strdup(getenv("LC_MONETARY")) : "";
const char* LC_MESSAGES_orig = const char* LC_MESSAGES_orig =
@ -397,8 +397,8 @@ void test04()
setenv("LC_ALL", "", 1); setenv("LC_ALL", "", 1);
setenv("LC_CTYPE", "", 1); setenv("LC_CTYPE", "", 1);
setenv("LC_NUMERIC", "", 1); setenv("LC_NUMERIC", "", 1);
setenv("LC_COLLATE", "", 1);
setenv("LC_TIME", "", 1); setenv("LC_TIME", "", 1);
setenv("LC_COLLATE", "", 1);
setenv("LC_MONETARY", "", 1); setenv("LC_MONETARY", "", 1);
setenv("LC_MESSAGES", "", 1); setenv("LC_MESSAGES", "", 1);
#if _GLIBCPP_NUM_CATEGORIES #if _GLIBCPP_NUM_CATEGORIES
@ -430,13 +430,13 @@ void test04()
locale loc(""); locale loc("");
#if _GLIBCPP_NUM_CATEGORIES #if _GLIBCPP_NUM_CATEGORIES
VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_COLLATE=de_DE;" VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;"
"LC_TIME=C;LC_MONETARY=C;LC_MESSAGES=C;LC_PAPER=C;" "LC_COLLATE=de_DE;LC_MONETARY=C;LC_MESSAGES=C;LC_PAPER=C;"
"LC_NAME=C;LC_ADDRESS=C;LC_TELEPHONE=C;LC_MEASUREMENT=C;" "LC_NAME=C;LC_ADDRESS=C;LC_TELEPHONE=C;LC_MEASUREMENT=C;"
"LC_IDENTIFICATION=C" ); "LC_IDENTIFICATION=C" );
#else #else
VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_COLLATE=de_DE;" VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;"
"LC_TIME=C;LC_MONETARY=C;LC_MESSAGES=C" ); "LC_COLLATE=de_DE;LC_MONETARY=C;LC_MESSAGES=C" );
#endif #endif
} }
@ -446,13 +446,13 @@ void test04()
locale loc(""); locale loc("");
#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_COLLATE=de_DE;LC_TIME=fr_FR;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;"
"LC_ADDRESS=fr_FR;LC_TELEPHONE=fr_FR;LC_MEASUREMENT=fr_FR;" "LC_ADDRESS=fr_FR;LC_TELEPHONE=fr_FR;LC_MEASUREMENT=fr_FR;"
"LC_IDENTIFICATION=fr_FR" ); "LC_IDENTIFICATION=fr_FR" );
#else #else
VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;" VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;"
"LC_COLLATE=de_DE;LC_TIME=fr_FR;LC_MONETARY=fr_FR;" "LC_TIME=fr_FR;LC_COLLATE=de_DE;LC_MONETARY=fr_FR;"
"LC_MESSAGES=fr_FR" ); "LC_MESSAGES=fr_FR" );
#endif #endif
} }
@ -463,7 +463,7 @@ void test04()
{ {
locale loc(""); locale loc("");
VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;" VERIFY( loc.name() == "LC_CTYPE=fr_FR;LC_NUMERIC=fr_FR;"
"LC_COLLATE=de_DE;LC_TIME=fr_FR;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;"
"LC_ADDRESS=fr_FR;LC_TELEPHONE=fr_FR;LC_MEASUREMENT=fr_FR;" "LC_ADDRESS=fr_FR;LC_TELEPHONE=fr_FR;LC_MEASUREMENT=fr_FR;"
"LC_IDENTIFICATION=it_IT" ); "LC_IDENTIFICATION=it_IT" );
@ -475,8 +475,8 @@ void test04()
setenv("LC_ALL", LC_ALL_orig ? LC_ALL_orig : "", 1); setenv("LC_ALL", LC_ALL_orig ? LC_ALL_orig : "", 1);
setenv("LC_CTYPE", LC_CTYPE_orig ? LC_CTYPE_orig : "", 1); setenv("LC_CTYPE", LC_CTYPE_orig ? LC_CTYPE_orig : "", 1);
setenv("LC_NUMERIC", LC_NUMERIC_orig ? LC_NUMERIC_orig : "", 1); setenv("LC_NUMERIC", LC_NUMERIC_orig ? LC_NUMERIC_orig : "", 1);
setenv("LC_COLLATE", LC_COLLATE_orig ? LC_COLLATE_orig : "", 1);
setenv("LC_TIME", LC_TIME_orig ? LC_TIME_orig : "", 1); setenv("LC_TIME", LC_TIME_orig ? LC_TIME_orig : "", 1);
setenv("LC_COLLATE", LC_COLLATE_orig ? LC_COLLATE_orig : "", 1);
setenv("LC_MONETARY", LC_MONETARY_orig ? LC_MONETARY_orig : "", 1); setenv("LC_MONETARY", LC_MONETARY_orig ? LC_MONETARY_orig : "", 1);
setenv("LC_MESSAGES", LC_MESSAGES_orig ? LC_MESSAGES_orig : "", 1); setenv("LC_MESSAGES", LC_MESSAGES_orig ? LC_MESSAGES_orig : "", 1);
#if _GLIBCPP_NUM_CATEGORIES #if _GLIBCPP_NUM_CATEGORIES