third_party/protobuf/src/google/protobuf/generated_enum_reflection.h - Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll).

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/generated_enum_reflection.h

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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/src/google/protobuf/field_mask.pb.cc ('k') | third_party/protobuf/src/google/protobuf/generated_enum_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/generated_enum_reflection.h

diff --git a/third_party/protobuf/src/google/protobuf/generated_enum_reflection.h b/third_party/protobuf/src/google/protobuf/generated_enum_reflection.h

index fdcdc277909eed444ff8d7fd7bc897a9b3cfc745..a09a540bf540f0a8c22b37dfb3664964eb0ec43a 100644

--- a/third_party/protobuf/src/google/protobuf/generated_enum_reflection.h

+++ b/third_party/protobuf/src/google/protobuf/generated_enum_reflection.h

@@ -1,6 +1,6 @@

// Protocol Buffers - Google's data interchange format

-// https://developers.google.com/protocol-buffers/

+// http://code.google.com/p/protobuf/

// Redistribution and use in source and binary forms, with or without

// modification, are permitted provided that the following conditions are

@@ -41,9 +41,6 @@

#include <string>

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

-#include <google/protobuf/generated_enum_util.h>

namespace google {

namespace protobuf {

class EnumDescriptor;