third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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_generic_c11_atomic.h

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Update to new HEAD (b7632464b4) + restore GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER Created 4 years, 1 month 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

« third_party/protobuf/patches/0011-uninline_internal_default_instance.patch ('K') | « third_party/protobuf/src/google/protobuf/stubs/atomicops.h ('k') | third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.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_generic_c11_atomic.h

diff --git a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h

similarity index 97%

rename from third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h

rename to third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h

index 3b314fd0c9af5c6c4b582d304cd098a2f380a3fe..7bc584eb2114ff58badcd45d72ee8a32ea06b7b5 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_pnacl.h

+++ b/third_party/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_c11_atomic.h

@@ -30,8 +30,8 @@

// This file is an internal atomic implementation, use atomicops.h instead.

-#ifndef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_PNACL_H_

-#define GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_PNACL_H_

+#ifndef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_C11_ATOMIC_H_

+#define GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_C11_ATOMIC_H_

#include <atomic>

@@ -228,4 +228,4 @@ inline Atomic64 Release_Load(volatile const Atomic64* ptr) {

} // namespace protobuf

} // namespace google

-#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_PNACL_H_

+#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_C11_ATOMIC_H_