third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc - Issue 2495533002: 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/util/internal/type_info_test_helper.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component 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/util/internal/type_info_test_helper.h ('k') | third_party/protobuf/src/google/protobuf/util/internal/utility.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc

diff --git a/third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc b/third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc

index 49e18ed0ffec0c9a92daf7e64f3c2b4e2c165504..737ba9e47551ab76edf768c5123df9d4a80b33cd 100644

--- a/third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc

+++ b/third_party/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc

@@ -55,7 +55,7 @@ namespace testing {

void TypeInfoTestHelper::ResetTypeInfo(

- const vector<const Descriptor*>& descriptors) {

+ const std::vector<const Descriptor*>& descriptors) {

switch (type_) {

case USE_TYPE_RESOLVER: {

const DescriptorPool* pool = descriptors[0]->file()->pool();

@@ -73,14 +73,14 @@ void TypeInfoTestHelper::ResetTypeInfo(

}

void TypeInfoTestHelper::ResetTypeInfo(const Descriptor* descriptor) {

- vector<const Descriptor*> descriptors;

+ std::vector<const Descriptor*> descriptors;

descriptors.push_back(descriptor);

ResetTypeInfo(descriptors);

}

void TypeInfoTestHelper::ResetTypeInfo(const Descriptor* descriptor1,

const Descriptor* descriptor2) {

- vector<const Descriptor*> descriptors;

+ std::vector<const Descriptor*> descriptors;

descriptors.push_back(descriptor1);

descriptors.push_back(descriptor2);

ResetTypeInfo(descriptors);