From 497fb40539610dee810d431b8ada717139c7d9c8 Mon Sep 17 00:00:00 2001 From: paolo Date: Mon, 3 Oct 2005 17:35:55 +0000 Subject: [PATCH] 2005-10-03 Paolo Carlini * include/tr1/hashtable (node_iterator::node_iterator(const node_iterator<,true,>&)): Fix to take a "false" (i.e., is_const == false) node_iterator. (hashtable_iterator::hashtable_iterator(const hashtable_iterator<, true,>&)): Likewise for hashtable_iterator. (hashtable::const_local_iterator): Fix typedef (is_const == true). (hashtable::const_iterator): Likewise. * testsuite/tr1/6_containers/unordered/types/map_iterator.cc: New. * testsuite/tr1/6_containers/unordered/types/multimap_iterator.cc: New. * testsuite/tr1/6_containers/unordered/types/set_iterator.cc: New. * testsuite/tr1/6_containers/unordered/types/multiset_iterator.cc: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@104900 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 14 +++++++ libstdc++-v3/include/tr1/hashtable | 8 ++-- .../6_containers/unordered/types/map_iterator.cc | 49 ++++++++++++++++++++++ .../unordered/types/multimap_iterator.cc | 49 ++++++++++++++++++++++ .../unordered/types/multiset_iterator.cc | 45 ++++++++++++++++++++ .../6_containers/unordered/types/set_iterator.cc | 45 ++++++++++++++++++++ 6 files changed, 206 insertions(+), 4 deletions(-) create mode 100644 libstdc++-v3/testsuite/tr1/6_containers/unordered/types/map_iterator.cc create mode 100644 libstdc++-v3/testsuite/tr1/6_containers/unordered/types/multimap_iterator.cc create mode 100644 libstdc++-v3/testsuite/tr1/6_containers/unordered/types/multiset_iterator.cc create mode 100644 libstdc++-v3/testsuite/tr1/6_containers/unordered/types/set_iterator.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 789c85c..1d0fc12 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2005-10-03 Paolo Carlini + + * include/tr1/hashtable + (node_iterator::node_iterator(const node_iterator<,true,>&)): Fix to + take a "false" (i.e., is_const == false) node_iterator. + (hashtable_iterator::hashtable_iterator(const hashtable_iterator<, + true,>&)): Likewise for hashtable_iterator. + (hashtable::const_local_iterator): Fix typedef (is_const == true). + (hashtable::const_iterator): Likewise. + * testsuite/tr1/6_containers/unordered/types/map_iterator.cc: New. + * testsuite/tr1/6_containers/unordered/types/multimap_iterator.cc: New. + * testsuite/tr1/6_containers/unordered/types/set_iterator.cc: New. + * testsuite/tr1/6_containers/unordered/types/multiset_iterator.cc: New. + 2005-10-02 Paolo Carlini PR libstdc++/24054 diff --git a/libstdc++-v3/include/tr1/hashtable b/libstdc++-v3/include/tr1/hashtable index f5f1e29..240c471 100644 --- a/libstdc++-v3/include/tr1/hashtable +++ b/libstdc++-v3/include/tr1/hashtable @@ -171,7 +171,7 @@ namespace Internal node_iterator(hash_node* p = 0) : node_iterator_base(p) { } - node_iterator(const node_iterator& x) + node_iterator(const node_iterator& x) : node_iterator_base(x.m_cur) { } reference @@ -266,7 +266,7 @@ namespace Internal hashtable_iterator(hash_node** b) : hashtable_iterator_base(*b, b) { } - hashtable_iterator(const hashtable_iterator& x) + hashtable_iterator(const hashtable_iterator& x) : hashtable_iterator_base(x.m_cur_node, x.m_cur_bucket) { } reference @@ -890,13 +890,13 @@ namespace tr1 typedef Internal::node_iterator local_iterator; - typedef Internal::node_iterator + typedef Internal::node_iterator const_local_iterator; typedef Internal::hashtable_iterator iterator; - typedef Internal::hashtable_iterator + typedef Internal::hashtable_iterator const_iterator; private: diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/map_iterator.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/map_iterator.cc new file mode 100644 index 0000000..da64404 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/map_iterator.cc @@ -0,0 +1,49 @@ +// 2005-10-02 Paolo Carlini +// +// Copyright (C) 2005 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. +// +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// { dg-do compile } + +#include + +void test01() +{ + typedef std::tr1::unordered_map Map; + + Map m; + + Map::const_iterator cit = m.begin(); + (*cit).second = 0; // { dg-error "read-only" } + + Map::const_local_iterator clit = m.begin(0); + (*clit).second = 0; // { dg-error "read-only" } + + Map::iterator it = cit; // { dg-error "conversion" } + + Map::local_iterator lit = clit; // { dg-error "conversion" } +} diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/multimap_iterator.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/multimap_iterator.cc new file mode 100644 index 0000000..a3d705a --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/multimap_iterator.cc @@ -0,0 +1,49 @@ +// 2005-10-02 Paolo Carlini +// +// Copyright (C) 2005 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. +// +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// { dg-do compile } + +#include + +void test01() +{ + typedef std::tr1::unordered_multimap Mmap; + + Mmap mm; + + Mmap::const_iterator cit = mm.begin(); + (*cit).second = 0; // { dg-error "read-only" } + + Mmap::const_local_iterator clit = mm.begin(0); + (*clit).second = 0; // { dg-error "read-only" } + + Mmap::iterator it = cit; // { dg-error "conversion" } + + Mmap::local_iterator lit = clit; // { dg-error "conversion" } +} diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/multiset_iterator.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/multiset_iterator.cc new file mode 100644 index 0000000..3b3161a --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/multiset_iterator.cc @@ -0,0 +1,45 @@ +// 2005-10-02 Paolo Carlini +// +// Copyright (C) 2005 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. +// +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// { dg-do compile } + +#include + +void test01() +{ + typedef std::tr1::unordered_multiset Mset; + + Mset ms; + + Mset::const_iterator cit = ms.begin(); + *cit = 0; // { dg-error "read-only" } + + Mset::const_local_iterator clit = ms.begin(0); + *clit = 0; // { dg-error "read-only" } +} diff --git a/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/set_iterator.cc b/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/set_iterator.cc new file mode 100644 index 0000000..40dc9c8 --- /dev/null +++ b/libstdc++-v3/testsuite/tr1/6_containers/unordered/types/set_iterator.cc @@ -0,0 +1,45 @@ +// 2005-10-02 Paolo Carlini +// +// Copyright (C) 2005 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +// USA. +// +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// { dg-do compile } + +#include + +void test01() +{ + typedef std::tr1::unordered_set Set; + + Set s; + + Set::const_iterator cit = s.begin(); + *cit = 0; // { dg-error "read-only" } + + Set::const_local_iterator clit = s.begin(0); + *clit = 0; // { dg-error "read-only" } +} -- 2.7.4