diff options
| author |  Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:10 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2017-12-01 10:05:10 -0800 |
| commit | 92a7e778e7394386f413cec28d67a07630f784b1 (patch) | |
| tree | cb5673c7c09b0d3905b48a24765d07e423bc5b30 /src/google/protobuf/util/message_differencer.cc | |
| parent | ce0a53273a400369932ba788d17500336a6ecaad (diff) | |
Integrated internal changes from Google
Diffstat (limited to 'src/google/protobuf/util/message_differencer.cc')
| -rw-r--r-- | src/google/protobuf/util/message_differencer.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/google/protobuf/util/message_differencer.cc b/src/google/protobuf/util/message_differencer.cc index e964e041..c32e941c 100644 --- a/src/google/protobuf/util/message_differencer.cc +++ b/src/google/protobuf/util/message_differencer.cc @@ -363,9 +363,6 @@ void MessageDifferencer::TreatAsMapUsingKeyComparator( const MapKeyComparator* key_comparator) { GOOGLE_CHECK(field->is_repeated()) << "Field must be repeated: " << field->full_name(); - GOOGLE_CHECK_EQ(FieldDescriptor::CPPTYPE_MESSAGE, field->cpp_type()) - << "Field has to be message type. Field name is: " - << field->full_name(); GOOGLE_CHECK(set_fields_.find(field) == set_fields_.end()) << "Cannot treat this repeated field as both Map and Set for " << "comparison."; @@ -1751,6 +1748,13 @@ void MessageDifferencer::StreamReporter::ReportUnknownFieldIgnored( printer_->Print("\n"); // Print for newlines. } +MessageDifferencer::MapKeyComparator* +MessageDifferencer::CreateMultipleFieldsMapKeyComparator( + const std::vector<std::vector<const FieldDescriptor*> >& key_field_paths) { + return new MultipleFieldsMapKeyComparator(this, key_field_paths); +} + + } // namespace util } // namespace protobuf } // namespace google |