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

Side by Side Diff

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

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

Side by Side 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, 6 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 unchanged:	1 unchanged:

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

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

4 @@ -82,9 +82,9 @@	4 @@ -82,9 +82,9 @@

5 }	5 }

6 } // namespace error.	6 } // namespace error.

7	7

8 -const Status Status::OK = Status();	8 -const Status Status::OK = Status();

9 -const Status Status::CANCELLED = Status(error::CANCELLED, "");	9 -const Status Status::CANCELLED = Status(error::CANCELLED, "");

10 -const Status Status::UNKNOWN = Status(error::UNKNOWN, "");	10 -const Status Status::UNKNOWN = Status(error::UNKNOWN, "");

(...skipping 40 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
51 - static const Status CANCELLED;	51 - static const Status CANCELLED;

52 - static const Status UNKNOWN;	52 - static const Status UNKNOWN;

53 + static const StatusPod OK;	53 + static const StatusPod OK;

54 + static const StatusPod CANCELLED;	54 + static const StatusPod CANCELLED;

55 + static const StatusPod UNKNOWN;	55 + static const StatusPod UNKNOWN;

56	56

57 // Accessor	57 // Accessor

58 bool ok() const {	58 bool ok() const {

59 only in patch2:	59 only in patch2:

60 unchanged:	60 unchanged:

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

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

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

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

65

66 #include <iomanip>

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

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

69 #include <sstream>

70

71 namespace google {

OLD	NEW