000-09-07 Brad Garcia <bgarcia@laurelnetworks.com>

	* bits/stl_tree.h: Make operators !=, == type safe for map, set.
	* testsuite/23_containers/set_operators.cc: New file. Should not
	compile.
	* testsuite/23_containers/map_operators.cc: New file. Ditto.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36246 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 86 insertions, 0 deletions

diff --git a/libstdc++-v3/testsuite/23_containers/map_operators.cc b/libstdc++-v3/testsuite/23_containers/map_operators.cc
new file mode 100644
index 00000000000..4a46d811ff1
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/map_operators.cc
@@ -0,0 +1,44 @@
+// 2000-09-07 bgarcia@laurelnetworks.com
+
+// Copyright (C) 2000 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.4 template class multiset
+
+#include <map>
+#include <string>
+
+// map and set
+// libstdc++/86: map & set iterator comparisons are not type-safe
+// XXX this is XFAIL for the time being, ie this should not compile
+int main(void)
+{
+  bool test = true;
+  std::map<unsigned int, int> mapByIndex;
+  std::map<std::string, unsigned> mapByName;
+  
+  mapByIndex.insert(std::pair<unsigned, int>(0, 1));
+  mapByIndex.insert(std::pair<unsigned, int>(6, 5));
+  
+  std::map<unsigned, int>::iterator itr(mapByIndex.begin());
+  
+  test &= itr != mapByName.end(); // XXX - notice, it's not mapByIndex!!
+  test &= itr == mapByName.end(); // XXX - notice, it's not mapByIndex!!
+
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/23_containers/set_operators.cc b/libstdc++-v3/testsuite/23_containers/set_operators.cc
new file mode 100644
index 00000000000..42e01e9de4a
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/set_operators.cc
@@ -0,0 +1,42 @@
+// 2000-09-07 bgarcia@laurelnetworks.com
+
+// Copyright (C) 2000 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.4 template class multiset
+
+#include <set>
+#include <string>
+
+// map and set
+// libstdc++/86: map & set iterator comparisons are not type-safe
+// XXX this is XFAIL for the time being, ie this should not compile
+int main(void)
+{
+  bool test = true;
+
+  std::set<unsigned int> setByIndex;
+  std::set<std::string> setByName;
+  
+  std::set<unsigned int>::iterator itr(setByIndex.begin());
+  
+  test &= itr != setByName.end(); // XXX - notice, it's not setByIndex!!
+  test &= itr == setByName.end(); // XXX - notice, it's not setByIndex!!
+
+  return 0;
+}