diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2000-05-10 20:23:27 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-05-10 20:23:27 +0000 |
| commit | f035fae1edefcf14efe3ad5404ae14807f17acc7 (patch) | |
| tree | 331c206ff8fe62c73401a1fbd12bed2fe8ac4eb1 | |
| parent | 9a689793b001668858bd26cabf0232d633082ec4 (diff) | |
| download | gcc-f035fae1edefcf14efe3ad5404ae14807f17acc7.zip gcc-f035fae1edefcf14efe3ad5404ae14807f17acc7.tar.gz gcc-f035fae1edefcf14efe3ad5404ae14807f17acc7.tar.bz2 | |
Finish up FreeBSD4.0 support.
2000-05-10 Benjamin Kosnik <bkoz@redhat.com>
Finish up FreeBSD4.0 support.
* config/bsd/ctype.cc: Scope out toupper, tolower calls.
* config/generic/ctype.cc: And here.
* testsuite/21_strings/char_traits.cc (test02): Guard with
_GLIBCPP_USE_WCHAR_T.
From-SVN: r33831
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/config/bsd/ctype.cc | 8 | ||||
| -rw-r--r-- | libstdc++-v3/config/generic/ctype.cc | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/21_strings/char_traits.cc | 5 |
4 files changed, 20 insertions, 9 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e7b94d1..9d6b1ee 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2000-05-10 Benjamin Kosnik <bkoz@redhat.com> + + Finish up FreeBSD4.0 support. + * config/bsd/ctype.cc: Scope out toupper, tolower calls. + * config/generic/ctype.cc: And here. + * testsuite/21_strings/char_traits.cc (test02): Guard with + _GLIBCPP_USE_WCHAR_T. + 2000-05-09 Benjamin Kosnik <bkoz@gnu.org> * acinclude.m4 (GLIBCPP_CHECK_CPU): Change powerpc bits to diff --git a/libstdc++-v3/config/bsd/ctype.cc b/libstdc++-v3/config/bsd/ctype.cc index 5695dcd..01a7315 100644 --- a/libstdc++-v3/config/bsd/ctype.cc +++ b/libstdc++-v3/config/bsd/ctype.cc @@ -42,14 +42,14 @@ char ctype<char>::do_toupper(char __c) const - { return toupper((int) __c); } + { return ::toupper((int) __c); } const char* ctype<char>::do_toupper(char* __low, const char* __high) const { while (__low < __high) { - *__low = toupper((int) *__low); + *__low = ::toupper((int) *__low); ++__low; } return __high; @@ -57,14 +57,14 @@ char ctype<char>::do_tolower(char __c) const - { return tolower((int) __c); } + { return ::tolower((int) __c); } const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) { - *__low = tolower((int) *__low); + *__low = ::tolower((int) *__low); ++__low; } return __high; diff --git a/libstdc++-v3/config/generic/ctype.cc b/libstdc++-v3/config/generic/ctype.cc index dd7fc1a..0bf6b6b 100644 --- a/libstdc++-v3/config/generic/ctype.cc +++ b/libstdc++-v3/config/generic/ctype.cc @@ -42,14 +42,14 @@ char ctype<char>::do_toupper(char __c) const - { return toupper((int) __c); } + { return ::toupper((int) __c); } const char* ctype<char>::do_toupper(char* __low, const char* __high) const { while (__low < __high) { - *__low = toupper((int) *__low); + *__low = ::toupper((int) *__low); ++__low; } return __high; @@ -57,14 +57,14 @@ char ctype<char>::do_tolower(char __c) const - { return tolower((int) __c); } + { return ::tolower((int) __c); } const char* ctype<char>::do_tolower(char* __low, const char* __high) const { while (__low < __high) { - *__low = tolower((int) *__low); + *__low = ::tolower((int) *__low); ++__low; } return __high; diff --git a/libstdc++-v3/testsuite/21_strings/char_traits.cc b/libstdc++-v3/testsuite/21_strings/char_traits.cc index 493e4a7..0ad8425 100644 --- a/libstdc++-v3/testsuite/21_strings/char_traits.cc +++ b/libstdc++-v3/testsuite/21_strings/char_traits.cc @@ -109,6 +109,7 @@ int test01(void) return test; } +#if _GLIBCPP_USE_WCHAR_T int test02(void) { bool test = true; @@ -193,12 +194,14 @@ int test02(void) return test; } - +#endif //_GLIBCPP_USE_WCHAR_T int main() { test01(); +#if _GLIBCPP_USE_WCHAR_T test02(); +#endif } |