diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-24 12:54:43 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-24 12:54:43 +0000 |
| commit | 0033bc176cfda7d9fd2ad435e5cec9f12ee3bbfe (patch) | |
| tree | 17c365c736d6c3f1ade64bc963d93a07ea1a16e3 /libstdc++-v3 | |
| parent | 140918212a3ceafe9e050b1103448bca0b4e035c (diff) | |
| download | gcc-0033bc176cfda7d9fd2ad435e5cec9f12ee3bbfe.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@216667 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_base.h | 1 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/atomic | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/29_atomics/headers/atomic/std_c++0x_neg.cc | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 0e230ca40d2..c2f185921f1 100644 --- 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 1fc0ebb7e40..1a511ad47d0 100644 --- 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 85dc252bb46..3556241e22b 100644 --- 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 b199132e5d1..af2b39401b0 100644 --- 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 } |