diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:19:00 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-02 09:19:00 -0800 |
| commit | 009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf (patch) | |
| tree | 8b441fd58860857f2e7bf5eabbf2226b92bf13c7 /src/libcoretest | |
| parent | 0101bbe7acb38e8113c0cafeb7d5ae0be6448e5b (diff) | |
| parent | f3a7ec7028c76b3a1c6051131328f372b068e33a (diff) | |
| download | rust-009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf.tar.gz rust-009ec5d2b0c4ab0e7dc7ab2f6b15754b4da14caf.zip | |
rollup merge of #20315: alexcrichton/std-sync
Conflicts: src/libstd/rt/exclusive.rs src/libstd/sync/barrier.rs src/libstd/sys/unix/pipe.rs src/test/bench/shootout-binarytrees.rs src/test/bench/shootout-fannkuch-redux.rs
Diffstat (limited to 'src/libcoretest')
| -rw-r--r-- | src/libcoretest/atomic.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcoretest/atomic.rs b/src/libcoretest/atomic.rs index 1fee304a976..f8e943ec9f6 100644 --- a/src/libcoretest/atomic.rs +++ b/src/libcoretest/atomic.rs @@ -70,9 +70,9 @@ fn int_xor() { assert_eq!(x.load(SeqCst), 0xf731 ^ 0x137f); } -static S_BOOL : AtomicBool = INIT_ATOMIC_BOOL; -static S_INT : AtomicInt = INIT_ATOMIC_INT; -static S_UINT : AtomicUint = INIT_ATOMIC_UINT; +static S_BOOL : AtomicBool = ATOMIC_BOOL_INIT; +static S_INT : AtomicInt = ATOMIC_INT_INIT; +static S_UINT : AtomicUint = ATOMIC_UINT_INIT; #[test] fn static_init() { |