diff options
| author | kennytm <kennytm@gmail.com> | 2017-11-10 17:07:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-10 17:07:09 +0800 |
| commit | 20e11db8f77bcbe3e92ce236cac9a32273c583e2 (patch) | |
| tree | 49a5c6dbb729ae50c3568a5324a6b9e7a4393234 | |
| parent | e26bcbe4d4377fd663a765a8d2c337b79c64c988 (diff) | |
| parent | 47ed4738d927c5415956f5420e4d633917111398 (diff) | |
Rollup merge of #45882 - japaric:gh45802, r=kennytm
fix core for targets with max-atomic-width = 0 closes #45802 cc @kennytm
| -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] |