third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc - Issue 1842653006: Update //third_party/protobuf to version 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/src/google/protobuf/compiler/cpp/cpp_service.cc

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge Created 4 years, 8 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/compiler/cpp/cpp_service.h ('k') | third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_string_field.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc

index d20018ea212f230d2ed1ea6cab67a0eab0de2783..226c2aa03b8094dfba184d3ccc750da8e76f91ef 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_service.cc

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

// Protocol Buffers - Google's data interchange format

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

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

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

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

@@ -301,7 +301,7 @@ void ServiceGenerator::GenerateGetPrototype(RequestOrResponse which,

printer->Print(vars_,

" default:\n"

" GOOGLE_LOG(FATAL) << \"Bad method index; this should never happen.\";\n"

- " return *reinterpret_cast< ::google::protobuf::Message*>(NULL);\n"

+ " return *static_cast< ::google::protobuf::Message*>(NULL);\n"

" }\n"

"}\n"

"\n");