third_party/protobuf/patches/0003-remove-static-initializers.patch - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

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/0003-remove-static-initializers.patch

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: owners Created 4 years, 7 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:

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

Download patch

« no previous file with comments | « third_party/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.m ('k') | third_party/protobuf/patches/0005-fix-include-js-generator.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/patches/0003-remove-static-initializers.patch

diff --git a/third_party/protobuf/patches/0003-remove-static-initializers.patch b/third_party/protobuf/patches/0003-remove-static-initializers.patch

index ed88d0a7fc171eef9293a0fde86e303c35e4d461..d5b6baedd36e38826c9885b695f3f4f6c724865b 100644

--- a/third_party/protobuf/patches/0003-remove-static-initializers.patch

+++ b/third_party/protobuf/patches/0003-remove-static-initializers.patch

@@ -58,14 +58,3 @@ unchanged:

bool ok() const {

only in patch2:

unchanged:

---- protobuf-cleaned/src/google/protobuf/stubs/int128.cc 2015-12-30 13:21:46.000000000 -0800

-+++ protobuf-patched/src/google/protobuf/stubs/int128.cc 2016-03-31 13:25:40.888006485 -0700

-@@ -31,7 +31,7 @@

- #include <google/protobuf/stubs/int128.h>

- #include <iomanip>

--#include <iostream> // NOLINT(readability/streams)

-+#include <ostream> // NOLINT(readability/streams)

- #include <sstream>

- namespace google {