diff options
| author | Gabriel Dos Reis <gdr@integrable-solutions.net> | 2003-07-14 13:32:26 +0000 |
|---|---|---|
| committer | Gabriel Dos Reis <gdr@gcc.gnu.org> | 2003-07-14 13:32:26 +0000 |
| commit | 3ad249b9c71911ab735f7ea4e43a0b3fa6f48513 (patch) | |
| tree | 951f2ab2eed0e05c0afe4a704d1009f1de6ba648 /libstdc++-v3 | |
| parent | 55ece1b348b5c67402a6efa630dacfbba0bcf7cb (diff) | |
| download | gcc-3ad249b9c71911ab735f7ea4e43a0b3fa6f48513.zip gcc-3ad249b9c71911ab735f7ea4e43a0b3fa6f48513.tar.gz gcc-3ad249b9c71911ab735f7ea4e43a0b3fa6f48513.tar.bz2 | |
Include <cstring> and <cstdlib>.
From-SVN: r69329
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/c_locale.h | 16 |
2 files changed, 14 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 093758c..78d4852 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2003-07-14 Gabriel Dos Reis <gcc@integrable-solutions.net> + + * config/locale/gnu/c_locale.h (__convert_from_v): Include + <cstring> and <cstdlib>. Qualify names. + 2003-07-13 Mark Mitchell <mark@codesourcery.com> * config/locale/generic/c_locale.h: Include <cstdlib> and diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index 6bc4c39..5ead068 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.h +++ b/libstdc++-v3/config/locale/gnu/c_locale.h @@ -38,6 +38,8 @@ #pragma GCC system_header +#include <cstring> // get std::strlen +#include <cstdlib> // get std::malloc #include <clocale> #include <langinfo.h> // For codecvt #include <iconv.h> // For codecvt using iconv, iconv_t @@ -73,10 +75,10 @@ namespace std _Tv __v, const __c_locale&, int __prec = -1) { char* __old = setlocale(LC_ALL, NULL); - char* __sav = static_cast<char*>(malloc(strlen(__old) + 1)); + char* __sav = static_cast<char*>(std::malloc(std::strlen(__old) + 1)); if (__sav) - strcpy(__sav, __old); - setlocale(LC_ALL, "C"); + std::strcpy(__sav, __old); + std::setlocale(LC_ALL, "C"); #endif int __ret; @@ -87,16 +89,16 @@ namespace std __ret = snprintf(__out, __size, __fmt, __v); #else if (__prec >= 0) - __ret = sprintf(__out, __fmt, __prec, __v); + __ret = std::sprintf(__out, __fmt, __prec, __v); else - __ret = sprintf(__out, __fmt, __v); + __ret = std::sprintf(__out, __fmt, __v); #endif #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) __gnu_cxx::__uselocale(__old); #else - setlocale(LC_ALL, __sav); - free(__sav); + std::setlocale(LC_ALL, __sav); + std::free(__sav); #endif return __ret; } |