bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20315: alexcrichton/std-sync

Browse source 
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
This commit is contained in:
Alex Crichton 2015-01-02 09:19:00 -08:00
commit 009ec5d2b0
45 changed files with 167 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/sys/unix/timer.rs
View file

@ -211,7 +211,7 @@ impl Timer {
// instead of ()
HELPER.boot(|| {}, helper);
static ID: atomic::AtomicUint = atomic::INIT_ATOMIC_UINT;
static ID: atomic::AtomicUint = atomic::ATOMIC_UINT_INIT;
let id = ID.fetch_add(1, atomic::Relaxed);
Ok(Timer {
id: id,