Skip to content

Commit

Permalink
Tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
Thiez committed May 13, 2013
1 parent fa1a172 commit 852af34
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/libcore/unstable/intrinsics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ pub extern "rust-intrinsic" {
pub fn atomic_cxchg(dst: &mut int, old: int, src: int) -> int;
pub fn atomic_cxchg_acq(dst: &mut int, old: int, src: int) -> int;
pub fn atomic_cxchg_rel(dst: &mut int, old: int, src: int) -> int;

#[cfg(not(stage0))]
pub fn atomic_load(src: &int) -> int;
#[cfg(not(stage0))]
pub fn atomic_load_acq(src: &int) -> int;

#[cfg(not(stage0))]
pub fn atomic_store(dst: &mut int, val: int);
#[cfg(not(stage0))]
Expand Down
2 changes: 1 addition & 1 deletion src/librustc/lib/llvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1574,7 +1574,7 @@ pub mod llvm {
Ptr: ValueRef,
Order: AtomicOrdering)
-> ValueRef;

pub unsafe fn LLVMBuildAtomicCmpXchg(B: BuilderRef,
LHS: ValueRef,
CMP: ValueRef,
Expand Down

5 comments on commit 852af34

@bors
Copy link
Contributor

@bors bors commented on 852af34 May 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from Aatch
at Thiez@852af34

@bors
Copy link
Contributor

@bors bors commented on 852af34 May 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging Thiez/rust/atomic = 852af34 into auto

@bors
Copy link
Contributor

@bors bors commented on 852af34 May 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thiez/rust/atomic = 852af34 merged ok, testing candidate = 1bf2f68

@bors
Copy link
Contributor

@bors bors commented on 852af34 May 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 852af34 May 13, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = 1bf2f68

Please sign in to comment.