diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2003-07-14 21:46:29 +0200 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2003-07-14 19:46:29 +0000 |
| commit | 2def5b76e3bc2b9ad6b96a56daed4c51dfa6dd03 (patch) | |
| tree | 54e0cb09348d19fc0352e804b81117e4e51aaeee | |
| parent | 5e08432ed0c87fe0e2a6b144e1f87b7615a08d46 (diff) | |
| download | gcc-2def5b76e3bc2b9ad6b96a56daed4c51dfa6dd03.zip gcc-2def5b76e3bc2b9ad6b96a56daed4c51dfa6dd03.tar.gz gcc-2def5b76e3bc2b9ad6b96a56daed4c51dfa6dd03.tar.bz2 | |
c_locale.h (__convert_from_v): Include <cstdio>.
2003-07-14 Paolo Carlini <pcarlini@unitus.it>
* config/locale/gnu/c_locale.h (__convert_from_v): Include
<cstdio>. Qualify names.
* config/locale/generic/c_locale.h (__convert_from_v): Ditto.
From-SVN: r69343
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/generic/c_locale.h | 25 | ||||
| -rw-r--r-- | libstdc++-v3/config/locale/gnu/c_locale.h | 5 |
3 files changed, 22 insertions, 14 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 24bde10..33dc3df 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,10 @@ 2003-07-14 Paolo Carlini <pcarlini@unitus.it> + + * config/locale/gnu/c_locale.h (__convert_from_v): Include + <cstdio>. Qualify names. + * config/locale/generic/c_locale.h (__convert_from_v): Ditto. + +2003-07-14 Paolo Carlini <pcarlini@unitus.it> Nathan C. Myers <ncm-nospam@cantrip.org> PR libstdc++/11378 diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index 72565fb..8e2072a 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -39,8 +39,9 @@ #pragma GCC system_header #include <clocale> -#include <cstdlib> -#include <cstring> +#include <cstdlib> // get std::malloc +#include <cstring> // get std::strlen +#include <cstdio> // get std::snprintf or std::sprintf #define _GLIBCXX_NUM_CATEGORIES 0 @@ -59,26 +60,26 @@ namespace std const char* __fmt, _Tv __v, const __c_locale&, int __prec = -1) { - char* __old = setlocale(LC_ALL, NULL); - char* __sav = static_cast<char*>(malloc(strlen(__old) + 1)); + char* __old = std::setlocale(LC_ALL, NULL); + 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"); int __ret; #ifdef _GLIBCXX_USE_C99 if (__prec >= 0) - __ret = snprintf(__out, __size, __fmt, __prec, __v); + __ret = std::snprintf(__out, __size, __fmt, __prec, __v); else - __ret = snprintf(__out, __size, __fmt, __v); + __ret = std::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 - setlocale(LC_ALL, __sav); - free(__sav); + std::setlocale(LC_ALL, __sav); + std::free(__sav); return __ret; } } diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index 5ead068..24636f4 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.h +++ b/libstdc++-v3/config/locale/gnu/c_locale.h @@ -40,6 +40,7 @@ #include <cstring> // get std::strlen #include <cstdlib> // get std::malloc +#include <cstdio> // get std::snprintf or std::sprintf #include <clocale> #include <langinfo.h> // For codecvt #include <iconv.h> // For codecvt using iconv, iconv_t @@ -84,9 +85,9 @@ namespace std int __ret; #ifdef _GLIBCXX_USE_C99 if (__prec >= 0) - __ret = snprintf(__out, __size, __fmt, __prec, __v); + __ret = std::snprintf(__out, __size, __fmt, __prec, __v); else - __ret = snprintf(__out, __size, __fmt, __v); + __ret = std::snprintf(__out, __size, __fmt, __v); #else if (__prec >= 0) __ret = std::sprintf(__out, __fmt, __prec, __v); |