From ddde5c6ddb9dee74cc583d0970dae4021a096ada Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 26 Jan 2007 18:00:42 +0000 Subject: [PATCH] re PR libstdc++/30586 (Namespace pollution in c++ headers) 2007-01-26 Paolo Carlini PR libstdc++/30586 * config/cpu/ia64/atomic_word.h: Just include . * testsuite/abi/30586.cc: New. From-SVN: r121209 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/config/cpu/ia64/atomic_word.h | 4 ++-- libstdc++-v3/testsuite/abi/30586.cc | 25 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/abi/30586.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 24034fa240a..97616867d98 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2007-01-26 Paolo Carlini + + PR libstdc++/30586 + * config/cpu/ia64/atomic_word.h: Just include . + * testsuite/abi/30586.cc: New. + 2007-01-25 Nathan Myers * include/bits/streambuf_iterator.h (istreambuf_iterator<>::equal): diff --git a/libstdc++-v3/config/cpu/ia64/atomic_word.h b/libstdc++-v3/config/cpu/ia64/atomic_word.h index ca6fa26b257..e50be3b4c08 100644 --- a/libstdc++-v3/config/cpu/ia64/atomic_word.h +++ b/libstdc++-v3/config/cpu/ia64/atomic_word.h @@ -1,6 +1,6 @@ // Low-level type for atomic operations -*- C++ -*- -// Copyright (C) 2004 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007 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 @@ -30,7 +30,7 @@ #ifndef _GLIBCXX_ATOMIC_WORD_H #define _GLIBCXX_ATOMIC_WORD_H 1 -#include +#include typedef int _Atomic_word; diff --git a/libstdc++-v3/testsuite/abi/30586.cc b/libstdc++-v3/testsuite/abi/30586.cc new file mode 100644 index 00000000000..7115d777688 --- /dev/null +++ b/libstdc++-v3/testsuite/abi/30586.cc @@ -0,0 +1,25 @@ +// { dg-do compile } + +// Copyright (C) 2007 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. + +#include + +// libstdc++/30586 +struct abi; +void foo(abi&);