From e6494c94344b9dd70185a6ace9779d88e4fdf322 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 31 Aug 2005 17:01:57 +0000 Subject: [PATCH] re PR libstdc++/23632 (std::vector in combination with debug mode fails to compile code) 2005-08-31 Paolo Carlini Kaspar Fischer PR libstdc++/23632 * include/bits/stl_bvector.h (_Bit_iterator::operator[], _Bit_const_iterator::operator[]): Const-ify. * testsuite/23_containers/vector/bool/23632.cc: New. Co-Authored-By: Kaspar Fischer From-SVN: r103686 --- libstdc++-v3/ChangeLog | 8 ++++ libstdc++-v3/include/bits/stl_bvector.h | 4 +- .../23_containers/vector/bool/23632.cc | 40 +++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/23_containers/vector/bool/23632.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1a86ff544d6..d88bef0ca19 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2005-08-31 Paolo Carlini + Kaspar Fischer + + PR libstdc++/23632 + * include/bits/stl_bvector.h (_Bit_iterator::operator[], + _Bit_const_iterator::operator[]): Const-ify. + * testsuite/23_containers/vector/bool/23632.cc: New. + 2005-08-30 Paolo Carlini PR libstdc++/23578 (cont) diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index afa25b1b4ca..05c7e09adfb 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -259,7 +259,7 @@ namespace _GLIBCXX_STD } reference - operator[](difference_type __i) + operator[](difference_type __i) const { return *(*this + __i); } }; @@ -345,7 +345,7 @@ namespace _GLIBCXX_STD } const_reference - operator[](difference_type __i) + operator[](difference_type __i) const { return *(*this + __i); } }; diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/23632.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/23632.cc new file mode 100644 index 00000000000..0259f7ccbce --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/23632.cc @@ -0,0 +1,40 @@ +// 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. + +// { dg-do compile } + +#include + +// libstdc++/23632 +void test01() +{ + std::vector v(100); + const std::vector::iterator fu = v.begin(); + if (!fu[0]) + fu[0] = true; + + const std::vector::const_iterator cfu = v.begin(); + if (cfu[0]) + ; +} + +int main() +{ + test01(); + return 0; +}