diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-22 10:46:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-22 10:46:27 +0000 |
| commit | a1395bba82c5a4a8d94468cc7c328ba9f02b70c0 (patch) | |
| tree | c662582a391e8ddc05a36058307c9d9351ae136a /src/atomic/mod.rs | |
| parent | 8a2a3763a3930f8ed143957d16cafc9ae979545c (diff) | |
| parent | e3ecc64607995b80c943803e650d6fb0cb18f906 (diff) | |
| download | crossbeam-utils-a1395bba82c5a4a8d94468cc7c328ba9f02b70c0.tar.gz | |
Upgrade rust/crates/crossbeam-utils to 0.8.5 am: 2ce91674eb am: f61a55cece am: 583b9b3aaf am: e3ecc64607
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/crossbeam-utils/+/1742398
Change-Id: Iaf76ef4434b3ee5672a7ecc6c606c2982dbb63e1
Diffstat (limited to 'src/atomic/mod.rs')
| -rw-r--r-- | src/atomic/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/atomic/mod.rs b/src/atomic/mod.rs index 874eaf2..fc713fc 100644 --- a/src/atomic/mod.rs +++ b/src/atomic/mod.rs @@ -3,11 +3,9 @@ //! * [`AtomicCell`], a thread-safe mutable memory location. //! * [`AtomicConsume`], for reading from primitive atomic types with "consume" ordering. +#[cfg(not(crossbeam_no_atomic_cas))] #[cfg(not(crossbeam_loom))] -use cfg_if::cfg_if; - -#[cfg(not(crossbeam_loom))] -cfg_if! { +cfg_if::cfg_if! { // Use "wide" sequence lock if the pointer width <= 32 for preventing its counter against wrap // around. // @@ -25,8 +23,10 @@ cfg_if! { } } +#[cfg(not(crossbeam_no_atomic_cas))] mod atomic_cell; mod consume; +#[cfg(not(crossbeam_no_atomic_cas))] pub use self::atomic_cell::AtomicCell; pub use self::consume::AtomicConsume; |