third_party/protobuf/src/google/protobuf/dynamic_message_unittest.cc - Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

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/dynamic_message_unittest.cc

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)

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

Index: third_party/protobuf/src/google/protobuf/dynamic_message_unittest.cc

diff --git a/third_party/protobuf/src/google/protobuf/dynamic_message_unittest.cc b/third_party/protobuf/src/google/protobuf/dynamic_message_unittest.cc

index fe51d8cfdc37ec5246ee6cde599ffb6348f11065..70e437d7d2c21405a4cbd0d7170737f01d712fc3 100644

--- a/third_party/protobuf/src/google/protobuf/dynamic_message_unittest.cc

+++ b/third_party/protobuf/src/google/protobuf/dynamic_message_unittest.cc

@@ -45,6 +45,8 @@

#include <google/protobuf/stubs/shared_ptr.h>

#endif

+#include <google/protobuf/stubs/scoped_ptr.h>

+#include <google/protobuf/stubs/common.h>

#include <google/protobuf/dynamic_message.h>

#include <google/protobuf/descriptor.h>

#include <google/protobuf/descriptor.pb.h>

@@ -53,7 +55,6 @@

#include <google/protobuf/unittest_no_field_presence.pb.h>

#include <google/protobuf/stubs/logging.h>

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

#include <google/protobuf/testing/googletest.h>

#include <gtest/gtest.h>