diff options
| author |  Bo Yang <teboring@google.com> | 2015-09-15 18:25:02 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2015-10-04 13:22:54 -0700 |
| commit | 7c14dc837b2fcd61ed244ced90debeb4b42d1119 (patch) | |
| tree | ebaea9d0a20b315f4f372136200494d4aff3936c /src/google/protobuf/util/message_differencer.cc | |
| parent | fbabf987e671aa37d11e1163e0175f99b32df5fe (diff) | |
Down-integrate internal bug fixing changes.
Diffstat (limited to 'src/google/protobuf/util/message_differencer.cc')
| -rw-r--r-- | src/google/protobuf/util/message_differencer.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/google/protobuf/util/message_differencer.cc b/src/google/protobuf/util/message_differencer.cc index d709da57..5a281f52 100644 --- a/src/google/protobuf/util/message_differencer.cc +++ b/src/google/protobuf/util/message_differencer.cc @@ -1341,9 +1341,11 @@ bool MessageDifferencer::MatchRepeatedFieldIndices( // doesn't neccessarily imply Compare(b, c). Therefore a naive greedy // algorithm will fail to find a maximum matching. // Here we use the argumenting path algorithm. - MaximumMatcher::NodeMatchCallback* callback = NewPermanentCallback( - this, &MessageDifferencer::IsMatch, repeated_field, key_comparator, - &message1, &message2, parent_fields); + MaximumMatcher::NodeMatchCallback* callback = + google::protobuf::internal::NewPermanentCallback( + this, &MessageDifferencer::IsMatch, + repeated_field, key_comparator, + &message1, &message2, parent_fields); MaximumMatcher matcher(count1, count2, callback, match_list1, match_list2); // If diff info is not needed, we should end the matching process as |