[v3] atomic includes

[v3] atomic includes

[Benjamin Kosnik]

[-- Attachment #1: Type: text/plain, Size: 106 bytes --]


Fixes for <stdatomic.h> when compiled as C++. Noticed by Lawrence Crowl.

tested x86_64/linux

-benjamin 

[-- Attachment #2: 20091016-1.patch --]
[-- Type: text/x-patch, Size: 1894 bytes --]

2009-10-16  Benjamin Kosnik  <bkoz@redhat.com>

	* include/c_compatibility/stdatomic.h: Include cstdatomic if
	__cplusplus.

Index: include/c_compatibility/stdatomic.h
===================================================================
--- include/c_compatibility/stdatomic.h	(revision 152914)
+++ include/c_compatibility/stdatomic.h	(working copy)
@@ -186,8 +186,11 @@
 _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;
Index: testsuite/29_atomics/atomic_flag/cons/1.cc
===================================================================
--- testsuite/29_atomics/atomic_flag/cons/1.cc	(revision 0)
+++ testsuite/29_atomics/atomic_flag/cons/1.cc	(revision 0)
@@ -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;
+}