diff options
| author |  Paul Yang <TeBoring@users.noreply.github.com> | 2015-10-09 12:38:31 -0700 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2015-10-09 12:38:31 -0700 |
| commit | 49f24afb45b7add17af3ed4493fa0a94d1cc64da (patch) | |
| tree | ffeba17cd9db828e86bb7318018305e6b4336d58 /src/google/protobuf/util/message_differencer.cc | |
| parent | 693cb3d22a605d758cd7e020b4f4bddfbb5ca10c (diff) | |
| parent | 7c14dc837b2fcd61ed244ced90debeb4b42d1119 (diff) | |
Merge pull request #815 from TeBoring/third-party
Use std::get where it's available
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 9a268973..47237e5a 100644 --- a/src/google/protobuf/util/message_differencer.cc +++ b/src/google/protobuf/util/message_differencer.cc @@ -1363,9 +1363,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 |