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_x86_msvc.h | |
| parent | 8d6f04ad8df47769bcab28945811c2d3e25f5cfe (diff) | |
use #undef instead of change the name of MemoryBarrier
Diffstat (limited to 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.h')
| -rw-r--r-- | src/google/protobuf/stubs/atomicops_internals_x86_msvc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h b/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h index b7acd09c..6f9869d1 100644 --- a/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h +++ b/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h @@ -82,7 +82,7 @@ inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { } inline Atomic32 Release_Load(volatile const Atomic32* ptr) { - MemoryBarrierInternal(); + MemoryBarrier(); return *ptr; } @@ -125,7 +125,7 @@ inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) { } inline Atomic64 Release_Load(volatile const Atomic64* ptr) { - MemoryBarrierInternal(); + MemoryBarrier(); return *ptr; } |