diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
commit | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (patch) | |
tree | e575738adf52d24b883cca5e8928a5ded31caba1 /src/google/protobuf/util/field_comparator.cc | |
parent | e7746f487cb9cca685ffb1b3d7dccc5554b618a4 (diff) | |
download | protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.gz protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.bz2 protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.zip |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/util/field_comparator.cc')
-rw-r--r-- | src/google/protobuf/util/field_comparator.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/google/protobuf/util/field_comparator.cc b/src/google/protobuf/util/field_comparator.cc index 86ddf06a..ed02ac4a 100644 --- a/src/google/protobuf/util/field_comparator.cc +++ b/src/google/protobuf/util/field_comparator.cc @@ -57,11 +57,9 @@ DefaultFieldComparator::DefaultFieldComparator() DefaultFieldComparator::~DefaultFieldComparator() {} FieldComparator::ComparisonResult DefaultFieldComparator::Compare( - const google::protobuf::Message& message_1, - const google::protobuf::Message& message_2, - const google::protobuf::FieldDescriptor* field, - int index_1, int index_2, - const google::protobuf::util::FieldContext* field_context) { + const Message& message_1, const Message& message_2, + const FieldDescriptor* field, int index_1, int index_2, + const util::FieldContext* field_context) { const Reflection* reflection_1 = message_1.GetReflection(); const Reflection* reflection_2 = message_2.GetReflection(); @@ -131,11 +129,10 @@ FieldComparator::ComparisonResult DefaultFieldComparator::Compare( } } -bool DefaultFieldComparator::Compare( - MessageDifferencer* differencer, - const Message& message1, - const Message& message2, - const google::protobuf::util::FieldContext* field_context) { +bool DefaultFieldComparator::Compare(MessageDifferencer* differencer, + const Message& message1, + const Message& message2, + const util::FieldContext* field_context) { return differencer->Compare( message1, message2, field_context->parent_fields()); } |