Эх сурвалжийг харах

Merge pull request #72 from Steelskin/master

Change references to `vector` to use `std::vector`
Feng Xiao 11 жил өмнө
parent
commit
11e6e9a3b0

+ 1 - 1
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

+ 1 - 1
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);
 };