From: bkoz Date: Sat, 13 Dec 2008 20:01:57 +0000 (+0000) Subject: 2008-12-13 Benjamin Kosnik X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=7f74c5eacd6ba2ac48e60e13130e960e3153f9d3 2008-12-13 Benjamin Kosnik * src/atomic.cc: Revert last change. * include/bits/atomic_2.h: Move cassert include to... * include/c_global/cstdatomic: ...here. * testsuite/29_atomics/atomic/cons/assign_neg.cc: Adjust line numbers. * testsuite/29_atomics/atomic/cons/copy_neg.cc: Same. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142742 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a2b80b57bec..3257632ae1b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2008-12-13 Benjamin Kosnik + + * src/atomic.cc: Revert last change. + * include/bits/atomic_2.h: Move cassert include to... + * include/c_global/cstdatomic: ...here. + * testsuite/29_atomics/atomic/cons/assign_neg.cc: Adjust line numbers. + * testsuite/29_atomics/atomic/cons/copy_neg.cc: Same. + 2008-12-12 Benjamin Kosnik * src/Makefile.am: Remove -x c++ for atomic build rules. diff --git a/libstdc++-v3/include/bits/atomic_2.h b/libstdc++-v3/include/bits/atomic_2.h index 48eda413cde..3c1be0109a4 100644 --- a/libstdc++-v3/include/bits/atomic_2.h +++ b/libstdc++-v3/include/bits/atomic_2.h @@ -38,8 +38,6 @@ #pragma GCC system_header -#include // XXX static_assert vs. constant-expression PR38502 - // _GLIBCXX_BEGIN_NAMESPACE(std) // 2 == __atomic2 == Always lock-free diff --git a/libstdc++-v3/include/c_global/cstdatomic b/libstdc++-v3/include/c_global/cstdatomic index 82d699b8e81..c13475c09e1 100644 --- a/libstdc++-v3/include/c_global/cstdatomic +++ b/libstdc++-v3/include/c_global/cstdatomic @@ -52,6 +52,7 @@ #include #include +#include // XXX static_assert vs. constant-expression PR38502 _GLIBCXX_BEGIN_NAMESPACE(std) diff --git a/libstdc++-v3/src/atomic.cc b/libstdc++-v3/src/atomic.cc index 5c6d58ab3cb..9e6444dcfe3 100644 --- a/libstdc++-v3/src/atomic.cc +++ b/libstdc++-v3/src/atomic.cc @@ -29,8 +29,8 @@ // the GNU General Public License. #include "gstdint.h" -#include #include +#include #define LOGSIZE 4 diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc index 834d68c33f9..4639716673d 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc @@ -39,19 +39,19 @@ int main() } // { dg-error "used here" "" { target *-*-* } 510 } -// { dg-error "deleted function" "" { target *-*-* } 257 } -// { dg-error "deleted function" "" { target *-*-* } 275 } -// { dg-error "deleted function" "" { target *-*-* } 293 } -// { dg-error "deleted function" "" { target *-*-* } 311 } -// { dg-error "deleted function" "" { target *-*-* } 329 } -// { dg-error "deleted function" "" { target *-*-* } 347 } -// { dg-error "deleted function" "" { target *-*-* } 365 } -// { dg-error "deleted function" "" { target *-*-* } 383 } -// { dg-error "deleted function" "" { target *-*-* } 401 } -// { dg-error "deleted function" "" { target *-*-* } 419 } -// { dg-error "deleted function" "" { target *-*-* } 437 } -// { dg-error "deleted function" "" { target *-*-* } 455 } -// { dg-error "deleted function" "" { target *-*-* } 473 } -// { dg-error "deleted function" "" { target *-*-* } 491 } -// { dg-error "deleted function" "" { target *-*-* } 239 } +// { dg-error "deleted function" "" { target *-*-* } 240 } +// { dg-error "deleted function" "" { target *-*-* } 258 } +// { dg-error "deleted function" "" { target *-*-* } 276 } +// { dg-error "deleted function" "" { target *-*-* } 294 } +// { dg-error "deleted function" "" { target *-*-* } 312 } +// { dg-error "deleted function" "" { target *-*-* } 330 } +// { dg-error "deleted function" "" { target *-*-* } 348 } +// { dg-error "deleted function" "" { target *-*-* } 366 } +// { dg-error "deleted function" "" { target *-*-* } 384 } +// { dg-error "deleted function" "" { target *-*-* } 402 } +// { dg-error "deleted function" "" { target *-*-* } 420 } +// { dg-error "deleted function" "" { target *-*-* } 438 } +// { dg-error "deleted function" "" { target *-*-* } 456 } +// { dg-error "deleted function" "" { target *-*-* } 474 } +// { dg-error "deleted function" "" { target *-*-* } 492 } // { dg-excess-errors "In member function" } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc index 94022289152..bb2d8e423cc 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc @@ -39,19 +39,19 @@ int main() } // { dg-error "used here" "" { target *-*-* } 549 } -// { dg-error "deleted function" "" { target *-*-* } 238 } -// { dg-error "deleted function" "" { target *-*-* } 256 } -// { dg-error "deleted function" "" { target *-*-* } 274 } -// { dg-error "deleted function" "" { target *-*-* } 292 } -// { dg-error "deleted function" "" { target *-*-* } 310 } -// { dg-error "deleted function" "" { target *-*-* } 328 } -// { dg-error "deleted function" "" { target *-*-* } 346 } -// { dg-error "deleted function" "" { target *-*-* } 364 } -// { dg-error "deleted function" "" { target *-*-* } 382 } -// { dg-error "deleted function" "" { target *-*-* } 400 } -// { dg-error "deleted function" "" { target *-*-* } 418 } -// { dg-error "deleted function" "" { target *-*-* } 436 } -// { dg-error "deleted function" "" { target *-*-* } 454 } -// { dg-error "deleted function" "" { target *-*-* } 472 } -// { dg-error "deleted function" "" { target *-*-* } 490 } +// { dg-error "deleted function" "" { target *-*-* } 239 } +// { dg-error "deleted function" "" { target *-*-* } 257 } +// { dg-error "deleted function" "" { target *-*-* } 275 } +// { dg-error "deleted function" "" { target *-*-* } 293 } +// { dg-error "deleted function" "" { target *-*-* } 311 } +// { dg-error "deleted function" "" { target *-*-* } 329 } +// { dg-error "deleted function" "" { target *-*-* } 347 } +// { dg-error "deleted function" "" { target *-*-* } 365 } +// { dg-error "deleted function" "" { target *-*-* } 383 } +// { dg-error "deleted function" "" { target *-*-* } 401 } +// { dg-error "deleted function" "" { target *-*-* } 419 } +// { dg-error "deleted function" "" { target *-*-* } 437 } +// { dg-error "deleted function" "" { target *-*-* } 455 } +// { dg-error "deleted function" "" { target *-*-* } 473 } +// { dg-error "deleted function" "" { target *-*-* } 491 } // { dg-excess-errors "In member function" }