Skip to content

Commit

Permalink
Rollup merge of rust-lang#45882 - japaric:gh45802, r=kennytm
Browse files Browse the repository at this point in the history
fix core for targets with max-atomic-width = 0

closes rust-lang#45802

cc @kennytm
  • Loading branch information
kennytm authored Nov 10, 2017
2 parents e26bcbe + 47ed473 commit 20e11db
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/libcore/sync/atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,7 @@ impl<T> AtomicPtr<T> {
}
}

#[cfg(target_has_atomic = "ptr")]
#[stable(feature = "atomic_from", since = "1.23.0")]
impl<T> From<*mut T> for AtomicPtr<T> {
#[inline]
Expand Down

0 comments on commit 20e11db

Please sign in to comment.