| OLD | NEW | 
|---|
| 1 #ifndef SkAtomics_atomic_DEFINED | 1 #ifndef SkAtomics_atomic_DEFINED | 
| 2 #define SkAtomics_atomic_DEFINED | 2 #define SkAtomics_atomic_DEFINED | 
| 3 | 3 | 
| 4 template <typename T> | 4 template <typename T> | 
| 5 T sk_atomic_load(const T* ptr, sk_memory_order mo) { | 5 T sk_atomic_load(const T* ptr, sk_memory_order mo) { | 
|  | 6     SkASSERT(mo == sk_memory_order_relaxed || | 
|  | 7              mo == sk_memory_order_seq_cst || | 
|  | 8              mo == sk_memory_order_acquire || | 
|  | 9              mo == sk_memory_order_consume); | 
| 6     return __atomic_load_n(ptr, mo); | 10     return __atomic_load_n(ptr, mo); | 
| 7 } | 11 } | 
| 8 | 12 | 
| 9 template <typename T> | 13 template <typename T> | 
| 10 void sk_atomic_store(T* ptr, T val, sk_memory_order mo) { | 14 void sk_atomic_store(T* ptr, T val, sk_memory_order mo) { | 
|  | 15     SkASSERT(mo == sk_memory_order_relaxed || | 
|  | 16              mo == sk_memory_order_seq_cst || | 
|  | 17              mo == sk_memory_order_release); | 
| 11     __atomic_store_n(ptr, val, mo); | 18     __atomic_store_n(ptr, val, mo); | 
| 12 } | 19 } | 
| 13 | 20 | 
| 14 template <typename T> | 21 template <typename T> | 
| 15 T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order mo) { | 22 T sk_atomic_fetch_add(T* ptr, T val, sk_memory_order mo) { | 
|  | 23     // All values of mo are valid. | 
| 16     return __atomic_fetch_add(ptr, val, mo); | 24     return __atomic_fetch_add(ptr, val, mo); | 
| 17 } | 25 } | 
| 18 | 26 | 
| 19 template <typename T> | 27 template <typename T> | 
| 20 bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired, | 28 bool sk_atomic_compare_exchange(T* ptr, T* expected, T desired, | 
| 21                                 sk_memory_order success, | 29                                 sk_memory_order success, | 
| 22                                 sk_memory_order failure) { | 30                                 sk_memory_order failure) { | 
|  | 31     // All values of success are valid. | 
|  | 32     SkASSERT(failure == sk_memory_order_relaxed || | 
|  | 33              failure == sk_memory_order_seq_cst || | 
|  | 34              failure == sk_memory_order_acquire || | 
|  | 35              failure == sk_memory_order_consume); | 
|  | 36     SkASSERT(failure <= success); | 
| 23     return __atomic_compare_exchange_n(ptr, expected, desired, false/*weak?*/, s
    uccess, failure); | 37     return __atomic_compare_exchange_n(ptr, expected, desired, false/*weak?*/, s
    uccess, failure); | 
| 24 } | 38 } | 
| 25 | 39 | 
| 26 #endif//SkAtomics_atomic_DEFINED | 40 #endif//SkAtomics_atomic_DEFINED | 
| OLD | NEW | 
|---|