summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2003-07-14 20:24:18 +0000
committerpaolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4>2003-07-14 20:24:18 +0000
commit515fca07aa0376939057989a7a4bbc12a99c3c46 (patch)
tree96b340b6f95910267eb4c3e96f867f9253d29de3 /libstdc++-v3
parent592ea28a8ea424ef8022fff605d1e1bc75f357c3 (diff)
downloadgcc-515fca07aa0376939057989a7a4bbc12a99c3c46.tar.gz
2003-07-14 Paolo Carlini <pcarlini@unitus.it>
* config/locale/gnu/c_locale.h (__convert_from_v): One more qualification. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@69353 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/config/locale/gnu/c_locale.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d3d7037d589..1cc23ddbed3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2003-07-14 Paolo Carlini <pcarlini@unitus.it>
+ * config/locale/gnu/c_locale.h (__convert_from_v): One more
+ qualification.
+
+2003-07-14 Paolo Carlini <pcarlini@unitus.it>
+
* include/bits/stl_tempbuf.h: Qualify free with std::.
* src/locale.cc: Include <cstdlib>, qualify getenv.
diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h
index 24636f4893d..069074eb9fe 100644
--- a/libstdc++-v3/config/locale/gnu/c_locale.h
+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
@@ -75,7 +75,7 @@ namespace std
#else
_Tv __v, const __c_locale&, int __prec = -1)
{
- char* __old = setlocale(LC_ALL, NULL);
+ char* __old = std::setlocale(LC_ALL, NULL);
char* __sav = static_cast<char*>(std::malloc(std::strlen(__old) + 1));
if (__sav)
std::strcpy(__sav, __old);