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.cc | |
| parent | 8d6f04ad8df47769bcab28945811c2d3e25f5cfe (diff) | |
use #undef instead of change the name of MemoryBarrier
Diffstat (limited to 'src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc')
| -rw-r--r-- | src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc b/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc index 3c112cc2..0b359796 100644 --- a/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc +++ b/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc @@ -44,7 +44,7 @@ namespace google { namespace protobuf { namespace internal { -inline void MemoryBarrierInternal() { +inline void MemoryBarrier() { // We use MemoryBarrier from WinNT.h ::MemoryBarrier(); } |