aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@unitus.it>2003-07-14 22:24:18 +0200
committerPaolo Carlini <paolo@gcc.gnu.org>2003-07-14 20:24:18 +0000
commitf45e487d7686932c9a8f16ce75d3a11026a51e5a (patch)
tree96b340b6f95910267eb4c3e96f867f9253d29de3
parentc1115ccd687a14e68e786ff674c004c6f36ace4b (diff)
downloadgcc-f45e487d7686932c9a8f16ce75d3a11026a51e5a.zip
gcc-f45e487d7686932c9a8f16ce75d3a11026a51e5a.tar.gz
gcc-f45e487d7686932c9a8f16ce75d3a11026a51e5a.tar.bz2
c_locale.h (__convert_from_v): One more qualification.
2003-07-14 Paolo Carlini <pcarlini@unitus.it> * config/locale/gnu/c_locale.h (__convert_from_v): One more qualification. From-SVN: r69353
-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 d3d7037..1cc23dd 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 24636f4..069074e 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);