codecvt.h: Remove __s.

2002-09-16  Benjamin Kosnik  <bkoz@redhat.com>

	* include/bits/codecvt.h: Remove __s.
	* config/locale/gnu/codecvt_members.cc: Remove _M_c_locale_codecvt
	usage, substitute _S_c_locale.

From-SVN: r57219

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 85ef8f782c3d92badb74ace9a9c33624e7154378..9d6bb9532914b226d3f5a168b4771cc45773f988 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-16  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * include/bits/codecvt.h: Remove __s.
+       * config/locale/gnu/codecvt_members.cc: Remove _M_c_locale_codecvt
+       usage, substitute _S_c_locale.
+
 2002-09-12  Benjamin Kosnik  <bkoz@redhat.com>
 
        * libmath/Makefile.am (LIBTOOL): Use --tag CC always for this

diff --git a/libstdc++-v3/config/locale/gnu/codecvt_members.cc b/libstdc++-v3/config/locale/gnu/codecvt_members.cc
index aa855a6a1f285c6ba00828015765849f002c4ef5..3569f6bf57b81dfe10939c98e862b7f2b390ab5b 100644 (file)
--- a/libstdc++-v3/config/locale/gnu/codecvt_members.cc
+++ b/libstdc++-v3/config/locale/gnu/codecvt_members.cc
@@ -50,7 +50,7 @@ namespace std
     result __ret = error;
     size_t __len = min(__from_end - __from, __to_end - __to);
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-    __c_locale __old = __uselocale(_M_c_locale_codecvt);
+    __c_locale __old = __uselocale(_S_c_locale);
 #endif
     size_t __conv = wcsrtombs(__to, &__from, __len, &__state);
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
@@ -85,7 +85,7 @@ namespace std
     result __ret = error;
     size_t __len = min(__from_end - __from, __to_end - __to);
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
-    __c_locale __old = __uselocale(_M_c_locale_codecvt);
+    __c_locale __old = __uselocale(_S_c_locale);
 #endif
     size_t __conv = mbsrtowcs(__to, &__from, __len, &__state);
 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)

diff --git a/libstdc++-v3/include/bits/codecvt.h b/libstdc++-v3/include/bits/codecvt.h
index 423679a5ab02394d3e061b811af539b232db1031..3666e987d6debe446a0578c37c4da32b790aa3d6 100644 (file)
--- a/libstdc++-v3/include/bits/codecvt.h
+++ b/libstdc++-v3/include/bits/codecvt.h
@@ -320,7 +320,7 @@
     {
     public:
       explicit 
-      codecvt_byname(const char* __s, size_t __refs = 0) 
+      codecvt_byname(const char*, size_t __refs = 0) 
       : codecvt<_InternT, _ExternT, _StateT>(__refs) { }
 
     protected: