Index: third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h |
diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h |
index 17dfaa518239e4253cfe69538c1e70f8fec18fad..cd97e0c994281cdfd73c2e173a46cab371e3728a 100644 |
--- a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h |
+++ b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_qnx.h |
@@ -110,17 +110,17 @@ inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { |
*ptr = value; |
} |
-inline void MemoryBarrier() { |
+inline void MemoryBarrierInternal() { |
__sync_synchronize(); |
} |
inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { |
*ptr = value; |
- MemoryBarrier(); |
+ MemoryBarrierInternal(); |
} |
inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { |
- MemoryBarrier(); |
+ MemoryBarrierInternal(); |
*ptr = value; |
} |
@@ -130,12 +130,12 @@ inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { |
inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { |
Atomic32 value = *ptr; |
- MemoryBarrier(); |
+ MemoryBarrierInternal(); |
return value; |
} |
inline Atomic32 Release_Load(volatile const Atomic32* ptr) { |
- MemoryBarrier(); |
+ MemoryBarrierInternal(); |
return *ptr; |
} |