third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc - Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc

Issue 2600753002: Reverts third_party/protobuf: Update to HEAD (f52e188fe4) (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.h ('k') | third_party/protobuf/src/google/protobuf/stubs/bytestream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc

diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc

index 74a1bd4e064b8d89b6893661120344c6f8e82dd3..741b164f0ff3aa466982426ed7992e61de3a5d45 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc

+++ b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc

@@ -44,10 +44,9 @@ namespace google {

namespace protobuf {

namespace internal {

-inline void MemoryBarrierInternal() {

- // On ARM this is a define while on x86/x64 this is

- // a function declared in WinNT.h

- MemoryBarrier();

+inline void MemoryBarrier() {

+ // We use MemoryBarrier from WinNT.h

+ ::MemoryBarrier();

}

Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,