diff options
author | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-06 22:14:29 +0000 |
---|---|---|
committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-08-06 22:14:29 +0000 |
commit | 9efebb3294791c0a3e26540f6c4943475603f1a5 (patch) | |
tree | d5790e067352c866acf94b0aed4d029dc42bcfb5 /src/google/protobuf/stubs/atomicops_internals_mips_gcc.h | |
parent | 8d6f04ad8df47769bcab28945811c2d3e25f5cfe (diff) |
use #undef instead of change the name of MemoryBarrier
Diffstat (limited to 'src/google/protobuf/stubs/atomicops_internals_mips_gcc.h')
-rw-r--r-- | src/google/protobuf/stubs/atomicops_internals_mips_gcc.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h b/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h index 95570a5f..dc468517 100644 --- a/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h +++ b/src/google/protobuf/stubs/atomicops_internals_mips_gcc.h @@ -125,8 +125,8 @@ inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, // ensure that no later memory access can be reordered ahead of the operation. // "Release" operations ensure that no previous memory access can be reordered // after the operation. "Barrier" operations have both "Acquire" and "Release" -// semantics. A MemoryBarrierInternal() has "Barrier" semantics, but does no -// memory access. +// semantics. A MemoryBarrier() has "Barrier" semantics, but does no memory +// access. inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, Atomic32 old_value, Atomic32 new_value) { @@ -149,17 +149,17 @@ inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { *ptr = value; } -inline void MemoryBarrierInternal() { +inline void MemoryBarrier() { __asm__ __volatile__("sync" : : : "memory"); } inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { *ptr = value; - MemoryBarrierInternal(); + MemoryBarrier(); } inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { - MemoryBarrierInternal(); + MemoryBarrier(); *ptr = value; } @@ -169,12 +169,12 @@ inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { Atomic32 value = *ptr; - MemoryBarrierInternal(); + MemoryBarrier(); return value; } inline Atomic32 Release_Load(volatile const Atomic32* ptr) { - MemoryBarrierInternal(); + MemoryBarrier(); return *ptr; } |