git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stl_tempbuf.h: Qualify free with std::. 

2003-07-14  Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/stl_tempbuf.h: Qualify free with std::.
	* src/locale.cc: Include <cstdlib>, qualify getenv.

From-SVN: r69347
This commit is contained in:
Paolo Carlini 2003-07-14 22:14:49 +02:00 committed by Paolo Carlini
parent 373f8df79e
commit f088510d96
3 changed files with 14 additions and 8 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 Paolo Carlini <pcarlini@unitus.it>
* include/bits/stl_tempbuf.h: Qualify free with std::.
* src/locale.cc: Include <cstdlib>, qualify getenv.
2003-07-14 Paolo Carlini <pcarlini@unitus.it> 2003-07-14 Paolo Carlini <pcarlini@unitus.it>
* config/locale/gnu/c_locale.h (__convert_from_v): Include * config/locale/gnu/c_locale.h (__convert_from_v): Include

4
libstdc++-v3/include/bits/stl_tempbuf.h
View File

@ -125,7 +125,7 @@ public:
} }
catch(...) catch(...)
{ {
free(_M_buffer); std::free(_M_buffer);
_M_buffer = 0; _M_buffer = 0;
_M_len = 0; _M_len = 0;
__throw_exception_again; __throw_exception_again;
@ -134,7 +134,7 @@ public:
~_Temporary_buffer() { ~_Temporary_buffer() {
std::_Destroy(_M_buffer, _M_buffer + _M_len); std::_Destroy(_M_buffer, _M_buffer + _M_len);
free(_M_buffer); std::free(_M_buffer);
} }
private: private:

13
libstdc++-v3/src/locale.cc
View File

@ -28,6 +28,7 @@
#include <clocale> #include <clocale>
#include <cstring> #include <cstring>
#include <cstdlib> // For getenv, free.
#include <cctype> #include <cctype>
#include <cwctype> // For towupper, etc. #include <cwctype> // For towupper, etc.
#include <locale> #include <locale>
@ -183,7 +184,7 @@ namespace std
else else
{ {
// Get it from the environment. // Get it from the environment.
char* __env = getenv("LC_ALL"); char* __env = std::getenv("LC_ALL");
// If LC_ALL is set we are done. // If LC_ALL is set we are done.
if (__env && std::strcmp(__env, "") != 0) if (__env && std::strcmp(__env, "") != 0)
{ {
@ -197,7 +198,7 @@ namespace std
{ {
char* __res; char* __res;
// LANG may set a default different from "C". // LANG may set a default different from "C".
char* __env = getenv("LANG"); char* __env = std::getenv("LANG");
if (!__env || std::strcmp(__env, "") == 0 if (!__env || std::strcmp(__env, "") == 0
|| std::strcmp(__env, "C") == 0 || std::strcmp(__env, "C") == 0
|| std::strcmp(__env, "POSIX") == 0) || std::strcmp(__env, "POSIX") == 0)
@ -211,7 +212,7 @@ namespace std
if (std::strcmp(__res, "C") == 0) if (std::strcmp(__res, "C") == 0)
for (; __i < _S_categories_size; ++__i) for (; __i < _S_categories_size; ++__i)
{ {
__env = getenv(_S_categories[__i]); __env = std::getenv(_S_categories[__i]);
if (__env && std::strcmp(__env, "") != 0 if (__env && std::strcmp(__env, "") != 0
&& std::strcmp(__env, "C") != 0 && std::strcmp(__env, "C") != 0
&& std::strcmp(__env, "POSIX") != 0) && std::strcmp(__env, "POSIX") != 0)
@ -220,7 +221,7 @@ namespace std
else else
for (; __i < _S_categories_size; ++__i) for (; __i < _S_categories_size; ++__i)
{ {
__env = getenv(_S_categories[__i]); __env = std::getenv(_S_categories[__i]);
if (__env && std::strcmp(__env, "") != 0 if (__env && std::strcmp(__env, "") != 0
&& std::strcmp(__env, __res) != 0) && std::strcmp(__env, __res) != 0)
break; break;
@ -245,7 +246,7 @@ namespace std
__i++; __i++;
for (; __i < _S_categories_size; ++__i) for (; __i < _S_categories_size; ++__i)
{ {
__env = getenv(_S_categories[__i]); __env = std::getenv(_S_categories[__i]);
if (!__env || std::strcmp(__env, "") == 0) if (!__env || std::strcmp(__env, "") == 0)
{ {
__str += _S_categories[__i]; __str += _S_categories[__i];
@ -276,7 +277,7 @@ namespace std
(_M_impl = _S_classic)->_M_add_reference(); (_M_impl = _S_classic)->_M_add_reference();
else else
_M_impl = new _Impl(__res, 1); _M_impl = new _Impl(__res, 1);
free(__res); std::free(__res);
} }
} }
} }