re PR libstdc++/3349 (bug in map::insert(p,t))

2001-08-24  Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
            Phil Edwards  <pme@sources.redhat.com>

	PR libstdc++/3349
	* include/bits/stl_tree.h (insert_unique):  Revert last change.
	Values inserted at begin() must be less, not greater, than *begin()'s.
	* testsuite/23_containers/map_insert.cc:  New file.

Co-Authored-By: Phil Edwards <pme@gcc.gnu.org>
From-SVN: r45155

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 672ed390434f0e780e2b26906fe487c72b4996ec..7bdc1f3dc468b8aaacb2cfebfec3a93eb000fdeb 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-24  Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
+            Phil Edwards  <pme@sources.redhat.com>
+
+       PR libstdc++/3349
+       * include/bits/stl_tree.h (insert_unique):  Revert last change.
+       Values inserted at begin() must be less, not greater, than *begin()'s.
+       * testsuite/23_containers/map_insert.cc:  New file.
+
 2001-08-23  Benjamin Kosnik  <bkoz@redhat.com>
 
        * config/locale/c_locale_gnu.cc: Minor tweaks.

diff --git a/libstdc++-v3/include/bits/stl_tree.h b/libstdc++-v3/include/bits/stl_tree.h
index 756bc954ddd45f8f6285fc63549007b39ceed511..446cce0d3ec75a6c7892ab584a23586b3ea7e4bd 100644 (file)
--- a/libstdc++-v3/include/bits/stl_tree.h
+++ b/libstdc++-v3/include/bits/stl_tree.h
@@ -922,7 +922,7 @@ _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>
 {
   if (__position._M_node == _M_header->_M_left) { // begin()
     if (size() > 0 && 
-       _M_key_compare(_S_key(__position._M_node), _KeyOfValue()(__v)))
+       _M_key_compare(_KeyOfValue()(__v), _S_key(__position._M_node)))
       return _M_insert(__position._M_node, __position._M_node, __v);
     // first argument just needs to be non-null 
     else

diff --git a/libstdc++-v3/testsuite/23_containers/map_insert.cc b/libstdc++-v3/testsuite/23_containers/map_insert.cc
new file mode 100644 (file)
index 0000000..d870897
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map_insert.cc
@@ -0,0 +1,69 @@
+// 2001-08-23 pme & Sylvain.Pion@sophia.inria.fr
+
+// Copyright (C) 2001 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.
+
+// 23.3.1.2, table 69 -- map::insert(p,t)
+
+#include <map>
+#include <testsuite_hooks.h>
+
+// { dg-do run }
+
+// libstdc++/3349 and
+// http://gcc.gnu.org/ml/gcc-patches/2001-08/msg01375.html
+void test01()
+{
+  typedef std::map<int, int>   Map;
+  Map             M;
+  Map::iterator   hint;
+
+  hint = M.insert(Map::value_type(7, 0)).first;
+
+  M.insert(hint, Map::value_type(8, 1));
+  M.insert(M.begin(), Map::value_type(9, 2));
+
+#if 0
+  // The tree's __rb_verify() member must be exposed in map<> before this
+  // will even compile.  It's good test to see that "missing" entries are
+  // in fact present in the {map,tree}, but in the wrong place.
+  if (0)
+  {
+      Map::iterator  i = M.begin();
+      while (i != M.end()) {
+          std::cerr << '(' << i->first << ',' << i->second << ")\n";
+          ++i;
+      }
+      std::cerr << "tree internal verify: "
+                << std::boolalpha << M.__rb_verify() << "\n";
+  }
+#endif
+
+  VERIFY ( M.find(7) != M.end() );
+  VERIFY ( M.find(8) != M.end() );
+  VERIFY ( M.find(9) != M.end() );
+}
+
+
+int main()
+{
+  test01();
+
+  return 0;
+}
+