re PR libstdc++/16020 (cannot copy __gnu_debug::bitset)

2004-06-18  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/16020
	* include/debug/safe_base.h
	(_Safe_sequence_base::_Safe_sequence_base(const _Safe_sequence_base&),
	_Safe_sequence_base::operator=): Provide definitions.
	* testsuite/23_containers/bitset/cons/16020.cc: New.

From-SVN: r83357

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4561e9e27a987c111fdc02b7ab09fcb2a1c71d52..bd7da02e485ab43e110acdf9049ec3394d5d5067 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-18  Paolo Carlini  <pcarlini@suse.de>
+
+       PR libstdc++/16020
+       * include/debug/safe_base.h
+       (_Safe_sequence_base::_Safe_sequence_base(const _Safe_sequence_base&),
+       _Safe_sequence_base::operator=): Provide definitions.
+       * testsuite/23_containers/bitset/cons/16020.cc: New.
+
 2004-06-18  Benjamin Kosnik  <bkoz@redhat.com>
 
        * include/ext/pool_allocator.h: Qualify __throw_bad_alloc.

diff --git a/libstdc++-v3/include/debug/safe_base.h b/libstdc++-v3/include/debug/safe_base.h
index 10f9ec72546951f27bf7d70054821b1a79e57a6a..fb62620f06a2c96599ceb6e0a01422ec4cf9c6e0 100644 (file)
--- a/libstdc++-v3/include/debug/safe_base.h
+++ b/libstdc++-v3/include/debug/safe_base.h
@@ -165,10 +165,23 @@ namespace __gnu_debug
     { }
 
     explicit
-    _Safe_sequence_base(const _Safe_sequence_base&);
+    _Safe_sequence_base(const _Safe_sequence_base& __seq)
+    : _M_iterators(__seq._M_iterators),
+      _M_const_iterators(__seq._M_const_iterators),
+      _M_version(__seq._M_version)
+    { }
 
     _Safe_sequence_base&
-    operator=(const _Safe_sequence_base&);
+    operator=(const _Safe_sequence_base& __seq)
+    {
+      if (&__seq != this)
+       {
+         _M_iterators = __seq._M_iterators;
+         _M_const_iterators = __seq._M_const_iterators;
+         _M_version = __seq._M_version;
+       }
+      return *this;
+    }
 
     /** Notify all iterators that reference this sequence that the
        sequence is being destroyed. */

diff --git a/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc b/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc
new file mode 100644 (file)
index 0000000..dbf1797
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/bitset/cons/16020.cc
@@ -0,0 +1,42 @@
+// 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++/16020
+void test01()
+{
+  using __gnu_debug::bitset;
+  bool test __attribute__((unused)) = true;
+
+  bitset<5> b(7);
+  bitset<5> c;
+
+  bitset<5> bb(b);
+  c = bb;
+
+  VERIFY( bb == b );
+  VERIFY( c == bb );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}