aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2014-09-24 10:40:10 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2014-09-24 10:40:10 +0100
commit8d6b3c1632fcc2be2efbeedc0e6280b0596dd45f (patch)
tree3d304e10f5819adc8da1dafe92f040ef5ec6d20d
parentacf816a3aca64e21ba98cedff112919313fdf6ce (diff)
downloadgcc-8d6b3c1632fcc2be2efbeedc0e6280b0596dd45f.zip
gcc-8d6b3c1632fcc2be2efbeedc0e6280b0596dd45f.tar.gz
gcc-8d6b3c1632fcc2be2efbeedc0e6280b0596dd45f.tar.bz2
re PR libstdc++/63353 (libstdc++-v3/src/c++11/ios.cc:232: possible typo ?)
PR libstdc++/63353 * src/c++11/ios.cc (ios_base::_M_swap): Fix typo. From-SVN: r215549
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/src/c++11/ios.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5edfaff..2f8abd7 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-24 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/63353
+ * src/c++11/ios.cc (ios_base::_M_swap): Fix typo.
+
2014-09-23 Jonathan Wakely <jwakely@redhat.com>
* config/abi/pre/gnu.ver: Adjust basic_ostream exports.
diff --git a/libstdc++-v3/src/c++11/ios.cc b/libstdc++-v3/src/c++11/ios.cc
index b5124ec..0e136d4 100644
--- a/libstdc++-v3/src/c++11/ios.cc
+++ b/libstdc++-v3/src/c++11/ios.cc
@@ -229,7 +229,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
std::swap(_M_local_word, __rhs._M_local_word); // array swap
else
{
- if (!__lhs_local && !__lhs_local)
+ if (!__lhs_local && !__rhs_local)
std::swap(_M_word, __rhs._M_word);
else
{