Change references to `vector` to use `std::vector`

Upstreaming patch used by Chromium in
https://codereview.chromium.org/693773003/
pull/72/head
Fabrice de Gans-Riberi 10 years ago
parent 53d202f587
commit 98db4958f0
  1. 2
      src/google/protobuf/extension_set.h
  2. 2
      src/google/protobuf/unknown_field_set.h

@ -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 {
void ClearFallback(); void ClearFallback();
vector<UnknownField>* fields_; std::vector<UnknownField>* fields_;
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnknownFieldSet); GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnknownFieldSet);
}; };

Loading…
Cancel
Save