diff options
| author |  jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-30 01:23:12 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-30 01:23:12 +0000 |
| commit | b7aebe40998d9a2526d6edf3f662d5b517dfdd1c (patch) | |
| tree | 96def6ed40bba8ea10fa147cdd21e66d657b59db /src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc | |
| parent | db9f7dd1acca195cac67ca1f90e656fb64ebeb21 (diff) | |
Change MemoryBarrier() to MemoryBarrierInternal(). Resolve name conflict in mingw gcc 4.8.1
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 0b359796..3c112cc2 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 MemoryBarrier() { +inline void MemoryBarrierInternal() { // We use MemoryBarrier from WinNT.h ::MemoryBarrier(); } |