diff options
author | Fabrice de Gans-Riberi <fdegans@google.com> | 2014-11-03 13:45:55 +0100 |
---|---|---|
committer | Fabrice de Gans-Riberi <fdegans@google.com> | 2014-11-03 13:48:42 +0100 |
commit | 98db4958f014566c6f7b8ec2dc4681badbb341f0 (patch) | |
tree | f65a80462185784bdb9e80739c0ff0d009daa183 /src | |
parent | 53d202f587f329f84ce11c3ce6f8037ccce73f67 (diff) | |
download | protobuf-98db4958f014566c6f7b8ec2dc4681badbb341f0.tar.gz protobuf-98db4958f014566c6f7b8ec2dc4681badbb341f0.tar.bz2 protobuf-98db4958f014566c6f7b8ec2dc4681badbb341f0.zip |
Change references to `vector` to use `std::vector`
Upstreaming patch used by Chromium in
https://codereview.chromium.org/693773003/
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/extension_set.h | 2 | ||||
-rw-r--r-- | src/google/protobuf/unknown_field_set.h | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/src/google/protobuf/unknown_field_set.h b/src/google/protobuf/unknown_field_set.h index ba202eb6..31f17e2a 100644 --- a/src/google/protobuf/unknown_field_set.h +++ b/src/google/protobuf/unknown_field_set.h @@ -145,7 +145,7 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet { void ClearFallback(); - vector<UnknownField>* fields_; + std::vector<UnknownField>* fields_; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnknownFieldSet); }; |