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

messages_members.h: Correct conditional.

Browse Source 
2002-03-25  Benjamin Kosnik  <bkoz@redhat.com>
            Jakub Jelinek  <jakub@redhat.com>

	* config/locale/gnu/messages_members.h: Correct conditional.
	* config/locale/gnu/messages_members.cc: Same.
	* config/locale/gnu/time_members.cc: Same.

From-SVN: r51332
This commit is contained in:
Benjamin Kosnik 2002-03-25 20:20:34 +00:00
parent 7b3e519838
commit 99ffa1e37a
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2002-03-25 Benjamin Kosnik <bkoz@redhat.com>
Jakub Jelinek <jakub@redhat.com>
* config/locale/gnu/messages_members.h: Correct conditional.
* config/locale/gnu/messages_members.cc: Same.
* config/locale/gnu/time_members.cc: Same.
2002-03-25 Ulrich Weigand <Ulrich.Weigand@de.ibm.com> 2002-03-25 Ulrich Weigand <Ulrich.Weigand@de.ibm.com>
Paolo Carlini <pcarlini@unitus.it> Paolo Carlini <pcarlini@unitus.it>
@ -95,7 +102,7 @@
* configure.in: Add comments pointing the way for autoconf 2.5x. * configure.in: Add comments pointing the way for autoconf 2.5x.
* aclocal.m4, config.h.in, configure: Regenerate. * aclocal.m4, config.h.in, configure: Regenerate.
2002-03-15 Philipp Thomas <pthomas@suse.de> 2002-03-18 Philipp Thomas <pthomas@suse.de>
* include/backward/hash_map.h: hash, hashtable, hash_map and * include/backward/hash_map.h: hash, hashtable, hash_map and
hash_multimap are in namespace __gnu_cxx. hash_multimap are in namespace __gnu_cxx.

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

@ -42,7 +42,7 @@ 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 __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__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);

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

@ -59,7 +59,7 @@
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 __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
__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);

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

@ -44,7 +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 __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
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
@ -188,7 +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 __GLIBC__ >= 2 && __GLIBC_MINOR__ > 2 #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
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