third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_unittest.cc - 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/src/google/protobuf/compiler/cpp/cpp_unittest.cc

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/src/google/protobuf/compiler/cpp/cpp_string_field.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/cpp/metadata_test.cc » ('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_unittest.cc

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

index 9942a343a5f1112e862c69aac5ed75bb8a403ff2..5d82946d6145328900070004eec68f9da6c1757a 100644

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

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

@@ -82,7 +82,6 @@

namespace google {

namespace protobuf {

-using internal::NewPermanentCallback;

namespace compiler {

namespace cpp {

@@ -1253,7 +1252,7 @@ class GeneratedServiceTest : public testing::Test {

foo_(descriptor_->FindMethodByName("Foo")),

bar_(descriptor_->FindMethodByName("Bar")),

stub_(&mock_channel_),

- done_(NewPermanentCallback(&DoNothing)) {}

+ done_(::google::protobuf::internal::NewPermanentCallback(&DoNothing)) {}

virtual void SetUp() {

ASSERT_TRUE(foo_ != NULL);