atomic_base.h: Avoid including <stdbool.h>.

2014-10-24  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/atomic_base.h: Avoid including <stdbool.h>.
	* include/std/atomic: When __cplusplus < 201103L skip the rest of
	the header.
	* testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc: Adjust.

From-SVN: r216667

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 0e230ca40d268ab8b1c6beca6c527c8b99b1b9be..c2f185921f127649a69eafd8a54d5077da935a7d 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2014-10-24  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/bits/atomic_base.h: Avoid including <stdbool.h>.
+       * include/std/atomic: When __cplusplus < 201103L skip the rest of
+       the header.
+       * testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc: Adjust.
+
 2014-10-23  François Dumont  <fdumont@gcc.gnu.org>
 
        * testsuite/25_algorithms/make_heap/complexity.cc: Add missing test

diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h
index 1fc0ebb7e40e071184bb45aa432ad2bdad7211ba..1a511ad47d0d5ac72fe58ff8c87d9f93a0442527 100644 (file)
--- a/libstdc++-v3/include/bits/atomic_base.h
+++ b/libstdc++-v3/include/bits/atomic_base.h
@@ -33,7 +33,6 @@
 #pragma GCC system_header
 
 #include <bits/c++config.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <bits/atomic_lockfree_defines.h>
 

diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic
index 85dc252bb46a6f7a8ae494595367255e8c49cc15..3556241e22b87f4a6434bb265d78c79db2c3eb2b 100644 (file)
--- a/libstdc++-v3/include/std/atomic
+++ b/libstdc++-v3/include/std/atomic
@@ -36,7 +36,7 @@
 
 #if __cplusplus < 201103L
 # include <bits/c++0x_warning.h>
-#endif
+#else
 
 #include <bits/atomic_base.h>
 
@@ -1129,4 +1129,6 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace
 
-#endif
+#endif // C++11
+
+#endif // _GLIBCXX_ATOMIC

diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc
index b199132e5d11848aa1da3c8b7f01773ee898e270..af2b39401b00fc2b4a852010768487a5c46ba8a9 100644 (file)
--- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc
+++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc
@@ -18,7 +18,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-#include <atomic>  // { dg-excess-errors "In file included from" }
+#include <atomic>
 
 // { dg-error "ISO C.. 2011" "" { target *-*-* } 32 }