diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-05 11:20:53 -0500 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-05 11:20:53 -0500 |
| commit | 11e6e9a3b0ae2dd801c27f485bdef48a711767d3 (patch) | |
| tree | bedd33263e92e0d119314058653cb1cd40eda4f2 /src | |
| parent | 2ba455f20c8f83f5349b6bbfbbe601e8946aab63 (diff) | |
| parent | 98db4958f014566c6f7b8ec2dc4681badbb341f0 (diff) | |
| download | protobuf-11e6e9a3b0ae2dd801c27f485bdef48a711767d3.tar.gz protobuf-11e6e9a3b0ae2dd801c27f485bdef48a711767d3.tar.bz2 protobuf-11e6e9a3b0ae2dd801c27f485bdef48a711767d3.zip | |
Merge pull request #72 from Steelskin/master
Change references to `vector` to use `std::vector`
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); }; |