This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Fix libstdc++/13838
- From: Paolo Carlini <pcarlini at suse dot de>
- To: "'gcc-patches at gcc dot gnu dot org'" <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 24 Jan 2004 02:24:11 +0100
- Subject: [v3] Fix libstdc++/13838
Hi,
really trivial, a nasty typo. I'm committing this to mainline
and 3_4 of course.
Tested x86-linux.
Paolo.
/////////////
2004-01-24 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/13838
* include/debug/bitset (operator|=): Fix typo.
* testsuite/23_containers/bitset/operations/13838.cc: New.
diff -urN libstdc++-v3-orig/include/debug/bitset libstdc++-v3/include/debug/bitset
--- libstdc++-v3-orig/include/debug/bitset 2003-12-09 05:26:28.000000000 +0100
+++ libstdc++-v3/include/debug/bitset 2004-01-24 01:50:41.000000000 +0100
@@ -141,7 +141,7 @@
bitset<_Nb>&
operator|=(const bitset<_Nb>& __rhs)
{
- _M_base() != __rhs;
+ _M_base() |= __rhs;
return *this;
}
diff -urN libstdc++-v3-orig/testsuite/23_containers/bitset/operations/13838.cc libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc
--- libstdc++-v3-orig/testsuite/23_containers/bitset/operations/13838.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/23_containers/bitset/operations/13838.cc 2004-01-24 02:07:50.000000000 +0100
@@ -0,0 +1,47 @@
+// Copyright (C) 2004 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+#include <debug/bitset>
+#include <testsuite_hooks.h>
+
+// libstdc++/13838
+void test01()
+{
+ using __gnu_debug::bitset;
+ bool test __attribute__((unused)) = true;
+
+ bitset<4> b0, b1;
+ b0.set(1);
+ b0.set(3);
+ b1.set(2);
+ b1.set(3);
+
+ b0 |= b1;
+
+ bitset<4> br;
+ br.set(1);
+ br.set(2);
+ br.set(3);
+
+ VERIFY( b0 == br );
+}
+
+int main()
+{
+ test01();
+}