This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] fix merge errors
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 16 Sep 2002 19:31:34 -0500
- Subject: [v3] fix merge errors
Branch only. Fixes some merge errors, hardwire to _S_c_locale instead
of using non-existent _M_c_locale_codecvt.
tested x86/linux glibc-2.2.x
tested x86/linux glibc-2.3.x
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.
Index: config/locale/gnu/codecvt_members.cc
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/gnu/codecvt_members.cc,v
retrieving revision 1.1.2.1
diff -c -p -r1.1.2.1 codecvt_members.cc
*** config/locale/gnu/codecvt_members.cc 13 Sep 2002 01:21:41 -0000 1.1.2.1
--- config/locale/gnu/codecvt_members.cc 17 Sep 2002 00:30:52 -0000
*************** namespace std
*** 50,56 ****
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);
#endif
size_t __conv = wcsrtombs(__to, &__from, __len, &__state);
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
--- 50,56 ----
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(_S_c_locale);
#endif
size_t __conv = wcsrtombs(__to, &__from, __len, &__state);
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
*************** namespace std
*** 85,91 ****
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);
#endif
size_t __conv = mbsrtowcs(__to, &__from, __len, &__state);
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
--- 85,91 ----
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(_S_c_locale);
#endif
size_t __conv = mbsrtowcs(__to, &__from, __len, &__state);
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
Index: include/bits/codecvt.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/include/bits/codecvt.h,v
retrieving revision 1.18.14.1
diff -c -p -r1.18.14.1 codecvt.h
*** include/bits/codecvt.h 13 Sep 2002 01:21:41 -0000 1.18.14.1
--- include/bits/codecvt.h 17 Sep 2002 00:30:53 -0000
***************
*** 320,326 ****
{
public:
explicit
! codecvt_byname(const char* __s, size_t __refs = 0)
: codecvt<_InternT, _ExternT, _StateT>(__refs) { }
protected:
--- 320,326 ----
{
public:
explicit
! codecvt_byname(const char*, size_t __refs = 0)
: codecvt<_InternT, _ExternT, _StateT>(__refs) { }
protected: