diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2009-10-16 20:17:39 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2009-10-16 20:17:39 +0000 |
| commit | 02be8f4a8a9088e9f00717b1720b2158830c7ac1 (patch) | |
| tree | d1ed0f880c4fdf544a5efa192c7599f254c90d6e | |
| parent | 315cff155219ea11bf95209165121376b12fe06e (diff) | |
| download | gcc-02be8f4a8a9088e9f00717b1720b2158830c7ac1.zip gcc-02be8f4a8a9088e9f00717b1720b2158830c7ac1.tar.gz gcc-02be8f4a8a9088e9f00717b1720b2158830c7ac1.tar.bz2 | |
stdatomic.h: Include cstdatomic if __cplusplus.
2009-10-16 Benjamin Kosnik <bkoz@redhat.com>
* include/c_compatibility/stdatomic.h: Include cstdatomic if
__cplusplus.
From-SVN: r152918
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/c_compatibility/stdatomic.h | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/1.cc | 27 |
3 files changed, 37 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4f8367e..ea1a571 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2009-10-16 Benjamin Kosnik <bkoz@redhat.com> + + * include/c_compatibility/stdatomic.h: Include cstdatomic if + __cplusplus. + 2009-10-15 Benjamin Kosnik <bkoz@redhat.com> PR libstdc++/40654 diff --git a/libstdc++-v3/include/c_compatibility/stdatomic.h b/libstdc++-v3/include/c_compatibility/stdatomic.h index f477116..eaa45cd 100644 --- a/libstdc++-v3/include/c_compatibility/stdatomic.h +++ b/libstdc++-v3/include/c_compatibility/stdatomic.h @@ -186,8 +186,11 @@ _GLIBCXX_BEGIN_EXTERN_C _GLIBCXX_END_EXTERN_C _GLIBCXX_END_NAMESPACE -// Inject into global namespace. XXX -#if defined(__cplusplus) && !defined(_GLIBCXX_STDATOMIC) +// Inject into global namespace. +#ifdef __cplusplus + +#include <cstdatomic> + using std::memory_order; using std::memory_order_relaxed; using std::memory_order_consume; diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/1.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/1.cc new file mode 100644 index 0000000..cfb0c1b --- /dev/null +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/cons/1.cc @@ -0,0 +1,27 @@ +// { dg-options "-std=gnu++0x" } +// { dg-do compile } + +// Copyright (C) 2008, 2009 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 3, 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 COPYING3. If not see +// <http://www.gnu.org/licenses/>. + +#include <stdatomic.h> + +void test01() +{ + using namespace std; + atomic_flag af = ATOMIC_FLAG_INIT; +} |