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_tsan.h | |
| parent | 8d6f04ad8df47769bcab28945811c2d3e25f5cfe (diff) | |
use #undef instead of change the name of MemoryBarrier
Diffstat (limited to 'src/google/protobuf/stubs/atomicops_internals_tsan.h')
| -rw-r--r-- | src/google/protobuf/stubs/atomicops_internals_tsan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/stubs/atomicops_internals_tsan.h b/src/google/protobuf/stubs/atomicops_internals_tsan.h index d7b10d89..8112ee02 100644 --- a/src/google/protobuf/stubs/atomicops_internals_tsan.h +++ b/src/google/protobuf/stubs/atomicops_internals_tsan.h @@ -206,7 +206,7 @@ inline Atomic64 Release_CompareAndSwap(volatile Atomic64 *ptr, return cmp; } -inline void MemoryBarrierInternal() { +inline void MemoryBarrier() { __tsan_atomic_thread_fence(__tsan_memory_order_seq_cst); } |