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

Include <cstring> and <cstdlib>. 

From-SVN: r69329
This commit is contained in:
Gabriel Dos Reis 2003-07-14 13:32:26 +00:00 committed by Gabriel Dos Reis
parent 55ece1b348
commit 3ad249b9c7
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -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

16
libstdc++-v3/config/locale/gnu/c_locale.h
View File

@ -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;
}