From 2c2702f24069df525753a803ddc0807ab9ac1776 Mon Sep 17 00:00:00 2001 From: Dominik Strasser Date: Wed, 27 Apr 2005 15:59:06 +0000 Subject: [PATCH] re PR libstdc++/21244 (Vector anonymous enum problem) 2005-04-27 Dominik Strasser Paolo Carlini PR libstdc++/21244 * include/bits/stl_bvector.h: Change the anonymous enum at namespace scope to _S_word_bit_enum. * testsuite/23_containers/vector/bool/21244.cc: New. Co-Authored-By: Paolo Carlini From-SVN: r98844 --- libstdc++-v3/ChangeLog | 8 +++++ libstdc++-v3/include/bits/stl_bvector.h | 2 +- .../23_containers/vector/bool/21244.cc | 36 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/23_containers/vector/bool/21244.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ccb473e462c..23839ec5e80 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2005-04-27 Dominik Strasser + Paolo Carlini + + PR libstdc++/21244 + * include/bits/stl_bvector.h: Change the anonymous enum + at namespace scope to _S_word_bit_enum. + * testsuite/23_containers/vector/bool/21244.cc: New. + 2005-04-27 Paolo Carlini * include/tr1/type_traits (has_trivial_copy, has_trivial_assign, diff --git a/libstdc++-v3/include/bits/stl_bvector.h b/libstdc++-v3/include/bits/stl_bvector.h index 74985071baa..ce903d1b629 100644 --- a/libstdc++-v3/include/bits/stl_bvector.h +++ b/libstdc++-v3/include/bits/stl_bvector.h @@ -64,7 +64,7 @@ namespace _GLIBCXX_STD { typedef unsigned long _Bit_type; - enum { _S_word_bit = int(CHAR_BIT * sizeof(_Bit_type)) }; + enum _S_word_bit_enum { _S_word_bit = int(CHAR_BIT * sizeof(_Bit_type)) }; struct _Bit_reference { diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/21244.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/21244.cc new file mode 100644 index 00000000000..d546d306146 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/21244.cc @@ -0,0 +1,36 @@ +// 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +#include + +// { dg-do compile } + +class Foo +{ +}; + +template Foo operator/(const Foo& arg1, T arg2) +{ + return Foo(); +} + +// libstdc++/21244 +void foo() +{ + std::vector bar(1); +}