FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

atomic.cc: Revert last change.

Browse source 
2008-12-13  Benjamin Kosnik  <bkoz@redhat.com>

	* 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.

From-SVN: r142742
This commit is contained in:
Benjamin Kosnik 2008-12-13 20:01:57 +00:00 • committed by Benjamin Kosnik
parent 521f3e9930
commit 1a6e675339
6 changed files with 40 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,11 @@
2008-12-13 Benjamin Kosnik <bkoz@redhat.com>
* 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 <bkoz@redhat.com>
* src/Makefile.am: Remove -x c++ for atomic build rules.

2
libstdc++-v3/include/bits/atomic_2.h
View file

@ -38,8 +38,6 @@
#pragma GCC system_header
#include <cassert> // XXX static_assert vs. constant-expression PR38502
// _GLIBCXX_BEGIN_NAMESPACE(std)
// 2 == __atomic2 == Always lock-free

1
libstdc++-v3/include/c_global/cstdatomic
View file

@ -52,6 +52,7 @@
#include <stdatomic.h>
#include <cstddef>
#include <cassert> // XXX static_assert vs. constant-expression PR38502
_GLIBCXX_BEGIN_NAMESPACE(std)

2
libstdc++-v3/src/atomic.cc
View file

@ -29,8 +29,8 @@
// the GNU General Public License.
#include "gstdint.h"
#include <mutex>
#include <cstdatomic>
#include <mutex>
#define LOGSIZE 4

30
libstdc++-v3/testsuite/29_atomics/atomic/cons/assign_neg.cc
View file

@ -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" }

30
libstdc++-v3/testsuite/29_atomics/atomic/cons/copy_neg.cc
View file

@ -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" }