third_party/protobuf/patches/0012-add-map-include.patch - Issue 2974603002: [Protobuf] Add <map> include to workaround a gcc bug

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/patches/0012-add-map-include.patch

Issue 2974603002: [Protobuf] Add <map> include to workaround a gcc bug (Closed)

Patch Set: Created 3 years, 5 months ago

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

Jump to:

Index: third_party/protobuf/patches/0012-add-map-include.patch

diff --git a/third_party/protobuf/patches/0012-add-map-include.patch b/third_party/protobuf/patches/0012-add-map-include.patch

new file mode 100644

index 0000000000000000000000000000000000000000..a7c12136c83d239e1eeed84608c781fa2b942a62

--- /dev/null

+++ b/third_party/protobuf/patches/0012-add-map-include.patch

@@ -0,0 +1,11 @@

+diff -ru protobuf/src/google/protobuf/descriptor.h protobuf2/src/google/protobuf/descriptor.h

+--- protobuf/src/google/protobuf/descriptor.h 2017-07-06 15:19:07.042709476 -0700

++++ protobuf2/src/google/protobuf/descriptor.h 2017-07-06 15:32:27.892104861 -0700

+@@ -54,7 +54,6 @@

+ #ifndef GOOGLE_PROTOBUF_DESCRIPTOR_H__

+ #define GOOGLE_PROTOBUF_DESCRIPTOR_H__

+-#include <map>

Peter Kasting 2017/07/06 23:19:23 Is this a reversed delta?

Tom Anderson 2017/07/06 23:51:08 Yep, oops

+ #include <memory>

+ #ifndef _SHARED_PTR_H

+ #include <google/protobuf/stubs/shared_ptr.h>