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

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

4 files changed, 22 insertions, 15 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fad3bb2..c622519 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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>
 
 	* testsuite/abi_check.cc: Add CXXABI_1.2.1 as compatible.
diff --git a/libstdc++-v3/config/locale/generic/c_locale.cc b/libstdc++-v3/config/locale/generic/c_locale.cc
index 689bbf5..23f7912 100644
--- a/libstdc++-v3/config/locale/generic/c_locale.cc
+++ b/libstdc++-v3/config/locale/generic/c_locale.cc
@@ -228,9 +228,9 @@ namespace std
 				    + _S_extra_categories_size] =
     {
       "LC_CTYPE", 
-      "LC_NUMERIC", 
+      "LC_NUMERIC",
+      "LC_TIME",   
       "LC_COLLATE", 
-      "LC_TIME", 
       "LC_MONETARY",
       "LC_MESSAGES"
     };
diff --git a/libstdc++-v3/config/locale/gnu/c_locale.cc b/libstdc++-v3/config/locale/gnu/c_locale.cc
index 188f3a2..19f98fc 100644
--- a/libstdc++-v3/config/locale/gnu/c_locale.cc
+++ b/libstdc++-v3/config/locale/gnu/c_locale.cc
@@ -191,9 +191,9 @@ namespace std
 				    + _S_extra_categories_size] =
     {
       "LC_CTYPE", 
-      "LC_NUMERIC", 
-      "LC_COLLATE", 
+      "LC_NUMERIC",
       "LC_TIME", 
+      "LC_COLLATE", 
       "LC_MONETARY",
       "LC_MESSAGES", 
       "LC_PAPER", 
diff --git a/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc b/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc
index 8ffef6e..2b26f4a 100644
--- a/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc
+++ b/libstdc++-v3/testsuite/22_locale/ctor_copy_dtor.cc
@@ -340,10 +340,10 @@ void test04()
     getenv("LC_CTYPE") ? strdup(getenv("LC_CTYPE")) : "";
   const char* LC_NUMERIC_orig = 
     getenv("LC_NUMERIC") ? strdup(getenv("LC_NUMERIC")) : "";
-  const char* LC_COLLATE_orig =
-    getenv("LC_COLLATE") ? strdup(getenv("LC_COLLATE")) : "";
   const char* LC_TIME_orig = 
     getenv("LC_TIME") ? strdup(getenv("LC_TIME")) : "";
+  const char* LC_COLLATE_orig =
+    getenv("LC_COLLATE") ? strdup(getenv("LC_COLLATE")) : "";
   const char* LC_MONETARY_orig = 
     getenv("LC_MONETARY") ? strdup(getenv("LC_MONETARY")) : "";
   const char* LC_MESSAGES_orig = 
@@ -397,8 +397,8 @@ void test04()
   setenv("LC_ALL", "", 1);
   setenv("LC_CTYPE", "", 1);
   setenv("LC_NUMERIC", "", 1);
-  setenv("LC_COLLATE", "", 1);
   setenv("LC_TIME", "", 1);
+  setenv("LC_COLLATE", "", 1);
   setenv("LC_MONETARY", "", 1);
   setenv("LC_MESSAGES", "", 1);
 #if _GLIBCPP_NUM_CATEGORIES
@@ -430,13 +430,13 @@ void test04()
       locale loc("");
 
 #if _GLIBCPP_NUM_CATEGORIES
-      VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_COLLATE=de_DE;"
-	      "LC_TIME=C;LC_MONETARY=C;LC_MESSAGES=C;LC_PAPER=C;"
+      VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=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_IDENTIFICATION=C" );
 #else
-      VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_COLLATE=de_DE;"
-	      "LC_TIME=C;LC_MONETARY=C;LC_MESSAGES=C" );
+      VERIFY( loc.name() == "LC_CTYPE=C;LC_NUMERIC=C;LC_TIME=C;"
+	      "LC_COLLATE=de_DE;LC_MONETARY=C;LC_MESSAGES=C" );
 #endif
     }
 
@@ -446,13 +446,13 @@ void test04()
       locale loc("");
 #if _GLIBCPP_NUM_CATEGORIES
       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_ADDRESS=fr_FR;LC_TELEPHONE=fr_FR;LC_MEASUREMENT=fr_FR;"
 	      "LC_IDENTIFICATION=fr_FR" );
 #else
       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" );
 #endif
     }
@@ -463,7 +463,7 @@ void test04()
     {
       locale loc("");
       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_ADDRESS=fr_FR;LC_TELEPHONE=fr_FR;LC_MEASUREMENT=fr_FR;"
 	      "LC_IDENTIFICATION=it_IT" );
@@ -475,8 +475,8 @@ void test04()
   setenv("LC_ALL", LC_ALL_orig ? LC_ALL_orig : "", 1);
   setenv("LC_CTYPE", LC_CTYPE_orig ? LC_CTYPE_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_COLLATE", LC_COLLATE_orig ? LC_COLLATE_orig : "", 1);
   setenv("LC_MONETARY", LC_MONETARY_orig ? LC_MONETARY_orig : "", 1);
   setenv("LC_MESSAGES", LC_MESSAGES_orig ? LC_MESSAGES_orig : "", 1);
 #if _GLIBCPP_NUM_CATEGORIES