aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/extension_set.h
diff options
context:
space:
mode:
authorGravatar Fabrice de Gans-Riberi <fdegans@google.com>2014-11-03 13:45:55 +0100
committerGravatar Fabrice de Gans-Riberi <fdegans@google.com>2014-11-03 13:48:42 +0100
commit98db4958f014566c6f7b8ec2dc4681badbb341f0 (patch)
treef65a80462185784bdb9e80739c0ff0d009daa183 /src/google/protobuf/extension_set.h
parent53d202f587f329f84ce11c3ce6f8037ccce73f67 (diff)
Change references to `vector` to use `std::vector`
Upstreaming patch used by Chromium in https://codereview.chromium.org/693773003/
Diffstat (limited to 'src/google/protobuf/extension_set.h')
-rw-r--r--src/google/protobuf/extension_set.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h
index d7ec5192..d6fc45df 100644
--- a/src/google/protobuf/extension_set.h
+++ b/src/google/protobuf/extension_set.h
@@ -182,7 +182,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