third_party/protobuf/src/google/protobuf/extension_set.h - Issue 693943003: Update from https://crrev.com/302630

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

Issue 693943003: Update from https://crrev.com/302630 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

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

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

index f3935fb3a380c6584b31d72774f15b8fda0aabfb..3ea11bf41caebee61ee029526852c690a232b17f 100644

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

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

@@ -180,7 +180,7 @@ class LIBPROTOBUF_EXPORT ExtensionSet {

// is useful to implement Reflection::ListFields().

void AppendToList(const Descriptor* containing_type,

const DescriptorPool* pool,

- vector<const FieldDescriptor*>* output) const;

+ std::vector<const FieldDescriptor*>* output) const;

// =================================================================

// Accessors