diff options
| author | bors <bors@rust-lang.org> | 2017-11-10 09:08:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-10 09:08:15 +0000 |
| commit | c0d326f06d562c3aedf0727a665e9f2c34ba9d0c (patch) | |
| tree | f746fee3284ccafdfe5cc190c4e46ea54fbbfda6 /src/libcore/sync | |
| parent | d5ff0e6422061c390a141354af8eacd540dca10b (diff) | |
| parent | 6a9931c3fbead83c7d605d978dd74ad6cca8c83e (diff) | |
| download | rust-c0d326f06d562c3aedf0727a665e9f2c34ba9d0c.tar.gz rust-c0d326f06d562c3aedf0727a665e9f2c34ba9d0c.zip | |
Auto merge of #45907 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests - Successful merges: #45783, #45856, #45863, #45869, #45878, #45882, #45887, #45895, #45901 - Failed merges:
Diffstat (limited to 'src/libcore/sync')
| -rw-r--r-- | src/libcore/sync/atomic.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs index cd3dd9ce139..b7cf6d778a2 100644 --- a/src/libcore/sync/atomic.rs +++ b/src/libcore/sync/atomic.rs @@ -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] |