* [v3] Fix libstdc++/17948
@ 2004-10-13 0:37 Paolo Carlini
0 siblings, 0 replies; only message in thread
From: Paolo Carlini @ 2004-10-13 0:37 UTC (permalink / raw)
To: 'gcc-patches@gcc.gnu.org'
[-- Attachment #1: Type: text/plain, Size: 119 bytes --]
Hi,
fix completely stupid commit of mine. Sorry.
Tested x86-linux, committing to mainline.
Paolo.
////////////////
[-- Attachment #2: CL_17948 --]
[-- Type: text/plain, Size: 282 bytes --]
2004-10-13 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/17948
* include/bits/stl_tree.h (erase(iterator, iterator)): Revert
wrong commit of 2004-10-07.
2004-10-13 Scott Snyder <snyder@fnal.gov>
PR libstdc++/17948
* testsuite/23_containers/set/modifiers/17948.cc: New.
[-- Attachment #3: patch_17948 --]
[-- Type: text/plain, Size: 2102 bytes --]
diff -urN libstdc++-v3-orig/include/bits/stl_tree.h libstdc++-v3/include/bits/stl_tree.h
--- libstdc++-v3-orig/include/bits/stl_tree.h 2004-10-08 00:44:30.000000000 +0200
+++ libstdc++-v3/include/bits/stl_tree.h 2004-10-13 01:24:05.000000000 +0200
@@ -1087,8 +1087,8 @@
if (__first == begin() && __last == end())
clear();
else
- for (; __first != __last; ++__first)
- erase(__first);
+ while (__first != __last)
+ erase(__first++);
}
template<typename _Key, typename _Val, typename _KeyOfValue,
diff -urN libstdc++-v3-orig/testsuite/23_containers/set/modifiers/17948.cc libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc
--- libstdc++-v3-orig/testsuite/23_containers/set/modifiers/17948.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/23_containers/set/modifiers/17948.cc 2004-10-13 01:29:48.000000000 +0200
@@ -0,0 +1,45 @@
+// Copyright (C) 2004 Free Software Foundation
+//
+// 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 <set>
+#include <testsuite_hooks.h>
+
+// libstdc++/17948
+void test01()
+{
+ bool test __attribute__((unused)) = true;
+ using namespace std;
+
+ typedef set<int>::size_type size_type;
+
+ set<int> s;
+
+ s.insert(2);
+ s.insert(3);
+
+ size_type x = s.erase(3);
+
+ VERIFY( s.size() == 1 );
+ VERIFY( x == 1 );
+}
+
+int main ()
+{
+ test01();
+ return 0;
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2004-10-13 0:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-13 0:37 [v3] Fix libstdc++/17948 Paolo Carlini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).