summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbje <bje@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-05 00:03:35 +0000
committerbje <bje@138bc75d-0d04-0410-961f-82ee72b054a4>2007-01-05 00:03:35 +0000
commitbb1187f769436e9c7e960d21efd87c8547721864 (patch)
tree0c38f626d614bf236a245c572eb35658fae99746
parentf3e715a63743a797aafa0fdf2f7e93518289a4ab (diff)
downloadppe42-gcc-bb1187f769436e9c7e960d21efd87c8547721864.tar.gz
ppe42-gcc-bb1187f769436e9c7e960d21efd87c8547721864.zip
Revert revision 120457.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120458 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/src/strstream.cc2
2 files changed, 1 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d8bc1126d68..d1a79955553 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,8 +1,3 @@
-2007-01-05 Ben Elliston <bje@au.ibm.com>
-
- * src/strstream.cc (strstreambuf::seekoff): Add parentheses around
- truth expression to eliminate a new warning from g++.
-
2006-12-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/30226
diff --git a/libstdc++-v3/src/strstream.cc b/libstdc++-v3/src/strstream.cc
index 3c5d8be839e..f2214549ab7 100644
--- a/libstdc++-v3/src/strstream.cc
+++ b/libstdc++-v3/src/strstream.cc
@@ -235,7 +235,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
if ((mode & (ios_base::in | ios_base::out))
== (ios_base::in | ios_base::out) &&
(dir == ios_base::beg || dir == ios_base::end))
- do_get = (do_put = true);
+ do_get = do_put = true;
else if (mode & ios_base::in)
do_get = true;
else if (mode & ios_base::out)
OpenPOWER on IntegriCloud