| Index: third_party/protobuf/src/google/protobuf/reflection_ops.cc
|
| diff --git a/third_party/protobuf/src/google/protobuf/reflection_ops.cc b/third_party/protobuf/src/google/protobuf/reflection_ops.cc
|
| index bb9c7f8bff784696ac6d9a91a1a536d3bd938fbb..4629dec2510b1cf80dc57f99c39a653193e50a17 100644
|
| --- a/third_party/protobuf/src/google/protobuf/reflection_ops.cc
|
| +++ b/third_party/protobuf/src/google/protobuf/reflection_ops.cc
|
| @@ -63,7 +63,7 @@ void ReflectionOps::Merge(const Message& from, Message* to) {
|
| const Reflection* from_reflection = from.GetReflection();
|
| const Reflection* to_reflection = to->GetReflection();
|
|
|
| - std::vector<const FieldDescriptor*> fields;
|
| + vector<const FieldDescriptor*> fields;
|
| from_reflection->ListFields(from, &fields);
|
| for (int i = 0; i < fields.size(); i++) {
|
| const FieldDescriptor* field = fields[i];
|
| @@ -129,7 +129,7 @@ void ReflectionOps::Merge(const Message& from, Message* to) {
|
| void ReflectionOps::Clear(Message* message) {
|
| const Reflection* reflection = message->GetReflection();
|
|
|
| - std::vector<const FieldDescriptor*> fields;
|
| + vector<const FieldDescriptor*> fields;
|
| reflection->ListFields(*message, &fields);
|
| for (int i = 0; i < fields.size(); i++) {
|
| reflection->ClearField(message, fields[i]);
|
| @@ -152,7 +152,7 @@ bool ReflectionOps::IsInitialized(const Message& message) {
|
| }
|
|
|
| // Check that sub-messages are initialized.
|
| - std::vector<const FieldDescriptor*> fields;
|
| + vector<const FieldDescriptor*> fields;
|
| reflection->ListFields(message, &fields);
|
| for (int i = 0; i < fields.size(); i++) {
|
| const FieldDescriptor* field = fields[i];
|
| @@ -183,7 +183,7 @@ void ReflectionOps::DiscardUnknownFields(Message* message) {
|
|
|
| reflection->MutableUnknownFields(message)->Clear();
|
|
|
| - std::vector<const FieldDescriptor*> fields;
|
| + vector<const FieldDescriptor*> fields;
|
| reflection->ListFields(*message, &fields);
|
| for (int i = 0; i < fields.size(); i++) {
|
| const FieldDescriptor* field = fields[i];
|
| @@ -224,7 +224,7 @@ static string SubMessagePrefix(const string& prefix,
|
| void ReflectionOps::FindInitializationErrors(
|
| const Message& message,
|
| const string& prefix,
|
| - std::vector<string>* errors) {
|
| + vector<string>* errors) {
|
| const Descriptor* descriptor = message.GetDescriptor();
|
| const Reflection* reflection = message.GetReflection();
|
|
|
| @@ -238,7 +238,7 @@ void ReflectionOps::FindInitializationErrors(
|
| }
|
|
|
| // Check sub-messages.
|
| - std::vector<const FieldDescriptor*> fields;
|
| + vector<const FieldDescriptor*> fields;
|
| reflection->ListFields(message, &fields);
|
| for (int i = 0; i < fields.size(); i++) {
|
| const FieldDescriptor* field = fields[i];
|
|
|