aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Strasser <dominik.strasser@infineon.com>2005-04-27 15:59:06 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2005-04-27 15:59:06 +0000
commit2c2702f24069df525753a803ddc0807ab9ac1776 (patch)
tree92b6db57eda964837742f21fc55cdde6151074e0
parentd2fce91b57927da819a1489798510865b88fb4ce (diff)
downloadgcc-2c2702f24069df525753a803ddc0807ab9ac1776.zip
gcc-2c2702f24069df525753a803ddc0807ab9ac1776.tar.gz
gcc-2c2702f24069df525753a803ddc0807ab9ac1776.tar.bz2
re PR libstdc++/21244 (Vector<bool> anonymous enum problem)
2005-04-27 Dominik Strasser <dominik.strasser@infineon.com> Paolo Carlini <pcarlini@suse.de> 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 <pcarlini@suse.de> From-SVN: r98844
-rw-r--r--libstdc++-v3/ChangeLog8
-rw-r--r--libstdc++-v3/include/bits/stl_bvector.h2
-rw-r--r--libstdc++-v3/testsuite/23_containers/vector/bool/21244.cc36
3 files changed, 45 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ccb473e..23839ec 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-27 Dominik Strasser <dominik.strasser@infineon.com>
+ Paolo Carlini <pcarlini@suse.de>
+
+ 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 <pcarlini@suse.de>
* 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 7498507..ce903d1 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 0000000..d546d30
--- /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 <vector>
+
+// { dg-do compile }
+
+class Foo
+{
+};
+
+template<class T> Foo operator/(const Foo& arg1, T arg2)
+{
+ return Foo();
+}
+
+// libstdc++/21244
+void foo()
+{
+ std::vector<bool> bar(1);
+}