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

messages_members.h: Add __uselocale bits. 

2002-03-22  Benjamin Kosnik  <bkoz@redhat.com>

	* config/locale/gnu/messages_members.h: Add __uselocale bits.
	* config/locale/gnu/messages_members.cc: Same.
	* config/locale/gnu/time_members.cc: Same.

From-SVN: r51217
This commit is contained in:
Benjamin Kosnik 2002-03-23 01:55:34 +00:00 committed by Benjamin Kosnik
parent d4c5ac1fc5
commit 1f3a2ce1db
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2002-03-22 Benjamin Kosnik <bkoz@redhat.com>
* config/locale/gnu/messages_members.h: Add __uselocale bits.
* config/locale/gnu/messages_members.cc: Same.
* config/locale/gnu/time_members.cc: Same.
2002-03-22 Benjamin Kosnik <bkoz@redhat.com>
* src/vterminate.cc: Format, -fno-exceptions cleanup.

7
libstdc++-v3/config/locale/gnu/messages_members.cc
View File

@ -42,11 +42,10 @@ namespace std
string
messages<char>::do_get(catalog, int, int, const string& __dfault) const
{
#if 0
// Requires glibc 2.3
__c_locale __old = uselocale(_M_c_locale_messages);
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
__c_locale __old = __uselocale(_M_c_locale_messages);
const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
uselocale(__old);
__uselocale(__old);
return string(__msg);
#else
const char* __old = setlocale(LC_ALL, _M_name_messages);

7
libstdc++-v3/config/locale/gnu/messages_members.h
View File

@ -59,11 +59,10 @@
messages<_CharT>::do_get(catalog, int, int,
const string_type& __dfault) const
{
#if 0
// Requires glibc 2.3
__c_locale __old = uselocale(_M_c_locale_messages);
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
__c_locale __old = __uselocale(_M_c_locale_messages);
char* __msg = gettext(_M_convert_to_char(__dfault));
uselocale(__old);
__uselocale(__old);
return _M_convert_from_char(__msg);
#else
const char* __old = setlocale(LC_ALL, _M_name_messages);

6
libstdc++-v3/config/locale/gnu/time_members.cc
View File

@ -44,8 +44,7 @@ namespace std
_M_put_helper(char* __s, size_t __maxlen, const char* __format,
const tm* __tm) const
{
#if 0
// Requires glibc 2.3
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
if (_M_c_locale_timepunct)
__strftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
else
@ -189,8 +188,7 @@ namespace std
_M_put_helper(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
const tm* __tm) const
{
#if 0
// Requires glibc 2.3
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
if (_M_c_locale_timepunct)
__wcsftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
else