Commit 11e6e9a3 authored by Feng Xiao's avatar Feng Xiao

Merge pull request #72 from Steelskin/master

Change references to `vector` to use `std::vector`
parents 2ba455f2 98db4958
...@@ -182,7 +182,7 @@ class LIBPROTOBUF_EXPORT ExtensionSet { ...@@ -182,7 +182,7 @@ class LIBPROTOBUF_EXPORT ExtensionSet {
// is useful to implement Reflection::ListFields(). // is useful to implement Reflection::ListFields().
void AppendToList(const Descriptor* containing_type, void AppendToList(const Descriptor* containing_type,
const DescriptorPool* pool, const DescriptorPool* pool,
vector<const FieldDescriptor*>* output) const; std::vector<const FieldDescriptor*>* output) const;
// ================================================================= // =================================================================
// Accessors // Accessors
......
...@@ -145,7 +145,7 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet { ...@@ -145,7 +145,7 @@ class LIBPROTOBUF_EXPORT UnknownFieldSet {
void ClearFallback(); void ClearFallback();
vector<UnknownField>* fields_; std::vector<UnknownField>* fields_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnknownFieldSet); GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnknownFieldSet);
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment