summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2007-05-07 18:44:54 -0400
committerJason Merrill <jason@gcc.gnu.org>2007-05-07 18:44:54 -0400
commit04055200edcb139e4be7088107191b7a1a9089fa (patch)
tree9a1b6cabb68d8e3b54517d37679ebd8c1b071b60
parent3eb5f26faa588b23d8888b0a2fbaa21d7c97d8c4 (diff)
downloadgcc-04055200edcb139e4be7088107191b7a1a9089fa.tar.gz
* include/bits/ostream.tcc (operator<<(char*)): Add __s.
From-SVN: r124522
-rw-r--r--libstdc++-v3/ChangeLog2
-rw-r--r--libstdc++-v3/include/bits/ostream.tcc8
2 files changed, 6 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 859bf846800..618da3cc867 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,7 @@
2007-05-07 Jason Merrill <jason@redhat.com>
+ * include/bits/ostream.tcc (operator<<(char*)): Add __s.
+
* config/abi/pre/gnu.ver: Fix symbol versions.
* config/abi/pre/gnu-versioned-namespace.ver: Likewise.
diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc
index 4691c64827a..c8bb8f65a7c 100644
--- a/libstdc++-v3/include/bits/ostream.tcc
+++ b/libstdc++-v3/include/bits/ostream.tcc
@@ -336,10 +336,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
{
struct __ptr_guard
{
- _CharT *p;
- __ptr_guard (_CharT *ip): p(ip) { }
- ~__ptr_guard() { delete[] p; }
- _CharT* __get() { return p; }
+ _CharT *__p;
+ __ptr_guard (_CharT *__ip): __p(__ip) { }
+ ~__ptr_guard() { delete[] __p; }
+ _CharT* __get() { return __p; }
} __pg (new _CharT[__clen]);
_CharT *__ws = __pg.__get();