Index: third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h |
diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h |
index 90e727b0bc56bb572acf070bc14fee0ea53ef4d9..6e2de67fa5a114b3483b216396cee93dc3fd11d4 100644 |
--- a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h |
+++ b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_arm_gcc.h |
@@ -115,17 +115,17 @@ inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { |
*ptr = value; |
} |
-inline void MemoryBarrier() { |
+inline void MemoryBarrierInternal() { |
pLinuxKernelMemoryBarrier(); |
} |
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; |
} |
@@ -135,12 +135,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; |
} |