diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index cb6c84cc9b8..eff65398930 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2005-09-12 Paolo Carlini + + PR libstdc++/23767 + * include/bits/stl_iterator.h (__normal_iterator:: + __normal_iterator<>(const __normal_iterator<_Iter, _Container>&)): + Enable only when _Iter is equal to _Container::pointer. + * testsuite/21_strings/basic_string/types/23767.cc: New. + * testsuite/23_containers/vector/types/23767.cc: Likewise. + * testsuite/ext/vstring/types/23767.cc: Likewise. + 2005-09-11 Benjamin Kosnik PR libstdc++/19265 diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h index 5a8ba1d60f8..5b8cf65e6d8 100644 --- a/libstdc++-v3/include/bits/stl_iterator.h +++ b/libstdc++-v3/include/bits/stl_iterator.h @@ -1,6 +1,6 @@ // Iterators -*- C++ -*- -// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2004, 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 @@ -65,6 +65,8 @@ #ifndef _ITERATOR_H #define _ITERATOR_H 1 +#include + namespace std { // 24.4.1 Reverse iterators @@ -604,9 +606,12 @@ namespace __gnu_cxx // Allow iterator to const_iterator conversion template - inline __normal_iterator(const __normal_iterator<_Iter, - _Container>& __i) - : _M_current(__i.base()) { } + __normal_iterator(const __normal_iterator<_Iter, + typename std::__enable_if<_Container, + (std::__are_same<_Iter, + typename _Container::pointer>::__value) + >::__type>& __i) + : _M_current(__i.base()) { } // Forward iterator requirements reference diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/types/23767.cc b/libstdc++-v3/testsuite/21_strings/basic_string/types/23767.cc new file mode 100644 index 00000000000..ecf813d3630 --- /dev/null +++ b/libstdc++-v3/testsuite/21_strings/basic_string/types/23767.cc @@ -0,0 +1,52 @@ +// 2005-09-12 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 + +struct T +{ + typedef std::string String; + typedef String::iterator iterator; + typedef String::const_iterator const_iterator; + + char t(iterator f) { return *f; } + char t(const_iterator f) const { return *f; } +}; + +// libstdc++/23767 +void f() +{ + std::string s; + T t; + T::const_iterator i = s.begin(); + + t.t(i); +} diff --git a/libstdc++-v3/testsuite/23_containers/vector/types/23767.cc b/libstdc++-v3/testsuite/23_containers/vector/types/23767.cc new file mode 100644 index 00000000000..26abe243717 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/types/23767.cc @@ -0,0 +1,52 @@ +// 2005-09-12 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 + +struct T +{ + typedef std::vector Vector; + typedef Vector::iterator iterator; + typedef Vector::const_iterator const_iterator; + + int t(iterator f) { return *f; } + int t(const_iterator f) const { return *f; } +}; + +// libstdc++/23767 +void f() +{ + std::vector v; + T t; + T::const_iterator i = v.begin(); + + t.t(i); +} diff --git a/libstdc++-v3/testsuite/ext/vstring/types/23767.cc b/libstdc++-v3/testsuite/ext/vstring/types/23767.cc new file mode 100644 index 00000000000..9b2d49a0ab2 --- /dev/null +++ b/libstdc++-v3/testsuite/ext/vstring/types/23767.cc @@ -0,0 +1,52 @@ +// 2005-09-12 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 + +struct T +{ + typedef __gnu_cxx::__vstring Vstring; + typedef Vstring::iterator iterator; + typedef Vstring::const_iterator const_iterator; + + char t(iterator f) { return *f; } + char t(const_iterator f) const { return *f; } +}; + +// libstdc++/23767 +void f() +{ + __gnu_cxx::__vstring vs; + T t; + T::const_iterator i = vs.begin(); + + t.t(i); +}