Skip to content

R
riscv-gcc-1
Commit 1f3a2ce1 by Benjamin Kosnik Committed by Benjamin Kosnik
Options

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
parent d4c5ac1f
Showing with 14 additions and 12 deletions
libstdc++-v3/ChangeLog
2002-03-22 Benjamin Kosnik <bkoz@redhat.com> 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. * src/vterminate.cc: Format, -fno-exceptions cleanup.
......
libstdc++-v3/config/locale/gnu/messages_members.cc
...@@ -42,11 +42,10 @@ namespace std ...@@ -42,11 +42,10 @@ namespace std
string string
messages<char>::do_get(catalog, int, int, const string& __dfault) const messages<char>::do_get(catalog, int, int, const string& __dfault) const
{ {
#if 0 #if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
// Requires glibc 2.3 __c_locale __old = __uselocale(_M_c_locale_messages);
__c_locale __old = uselocale(_M_c_locale_messages);
const char* __msg = const_cast<const char*>(gettext(__dfault.c_str())); const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
uselocale(__old); __uselocale(__old);
return string(__msg); return string(__msg);
#else #else
const char* __old = setlocale(LC_ALL, _M_name_messages); const char* __old = setlocale(LC_ALL, _M_name_messages);
......
libstdc++-v3/config/locale/gnu/messages_members.h
...@@ -59,11 +59,10 @@ ...@@ -59,11 +59,10 @@
messages<_CharT>::do_get(catalog, int, int, messages<_CharT>::do_get(catalog, int, int,
const string_type& __dfault) const const string_type& __dfault) const
{ {
#if 0 #if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
// Requires glibc 2.3 __c_locale __old = __uselocale(_M_c_locale_messages);
__c_locale __old = uselocale(_M_c_locale_messages);
char* __msg = gettext(_M_convert_to_char(__dfault)); char* __msg = gettext(_M_convert_to_char(__dfault));
uselocale(__old); __uselocale(__old);
return _M_convert_from_char(__msg); return _M_convert_from_char(__msg);
#else #else
const char* __old = setlocale(LC_ALL, _M_name_messages); const char* __old = setlocale(LC_ALL, _M_name_messages);
......
libstdc++-v3/config/locale/gnu/time_members.cc
...@@ -44,8 +44,7 @@ namespace std ...@@ -44,8 +44,7 @@ namespace std
_M_put_helper(char* __s, size_t __maxlen, const char* __format, _M_put_helper(char* __s, size_t __maxlen, const char* __format,
const tm* __tm) const const tm* __tm) const
{ {
#if 0 #if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
// Requires glibc 2.3
if (_M_c_locale_timepunct) if (_M_c_locale_timepunct)
__strftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm); __strftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
else else
...@@ -189,8 +188,7 @@ namespace std ...@@ -189,8 +188,7 @@ namespace std
_M_put_helper(wchar_t* __s, size_t __maxlen, const wchar_t* __format, _M_put_helper(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
const tm* __tm) const const tm* __tm) const
{ {
#if 0 #if __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2
// Requires glibc 2.3
if (_M_c_locale_timepunct) if (_M_c_locale_timepunct)
__wcsftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm); __wcsftime_l(__s, __maxlen, _M_c_locale_timepunct, __format, __tm);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment