This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Fix libstdc++/16813
- 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: Thu, 29 Jul 2004 12:50:26 +0200
- Subject: [v3] Fix libstdc++/16813
Hi,
I'm committing to mainline and 3_4-branch this trivial fix for
a typo in the debug-mode code.
Tested x86-linux.
Paolo.
/////////////
2004-07-29 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/16813
* include/debug/map.h (insert(_InputIterator, _InputIterator)):
Fix typo.
* testsuite/23_containers/map/insert/16813.cc: New.
diff -urN libstdc++-v3-orig/include/debug/map.h libstdc++-v3/include/debug/map.h
--- libstdc++-v3-orig/include/debug/map.h 2004-04-16 21:04:04.000000000 +0200
+++ libstdc++-v3/include/debug/map.h 2004-07-29 11:54:45.000000000 +0200
@@ -163,7 +163,7 @@
void
insert(_InputIterator __first, _InputIterator __last)
{
- __glibcxx_valid_range(__first, __last);
+ __glibcxx_check_valid_range(__first, __last);
_Base::insert(__first, __last);
}
diff -urN libstdc++-v3-orig/testsuite/23_containers/map/insert/16813.cc libstdc++-v3/testsuite/23_containers/map/insert/16813.cc
--- libstdc++-v3-orig/testsuite/23_containers/map/insert/16813.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/23_containers/map/insert/16813.cc 2004-07-29 12:08:41.000000000 +0200
@@ -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/map>
+#include <testsuite_hooks.h>
+
+// libstdc++/16813
+void test01()
+{
+ using __gnu_debug::map;
+ bool test __attribute__((unused)) = true;
+
+ map<int, float> m1, m2;
+
+ m1[3] = 3.0f;
+ m1[11] = -67.0f;
+
+ m2.insert(m1.begin(), m1.end());
+
+ VERIFY( m1 == m2 );
+}
+
+int main()
+{
+ test01();
+ return 0;
+}