diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-08-26 13:33:50 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-08-26 13:33:50 -0700 |
| commit | 042bfaf67f07ab7f277d35a5e654d101d980e202 (patch) | |
| tree | 1471754e2b1f78300a9165ce856b61c07d42ec6d /src/google/protobuf/util/internal | |
| parent | 11e36b1c39d5bee92c7a0d76e95523987af5c312 (diff) | |
| parent | b00595a3a9411cd54ab303a7ecbde0369d59cac1 (diff) | |
Merge remote-tracking branch 'origin/master' into beta-1
Diffstat (limited to 'src/google/protobuf/util/internal')
| -rw-r--r-- | src/google/protobuf/util/internal/protostream_objectwriter.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/protostream_objectwriter.cc b/src/google/protobuf/util/internal/protostream_objectwriter.cc index 28779301..a935ac39 100644 --- a/src/google/protobuf/util/internal/protostream_objectwriter.cc +++ b/src/google/protobuf/util/internal/protostream_objectwriter.cc @@ -1602,8 +1602,10 @@ bool ProtoStreamObjectWriter::IsMap(const google::protobuf::Field& field) { const google::protobuf::Type* field_type = typeinfo_->GetTypeByTypeUrl(field.type_url()); + // TODO(xiaofeng): Unify option names. return GetBoolOptionOrDefault(field_type->options(), - "google.protobuf.MessageOptions.map_entry", false); + "google.protobuf.MessageOptions.map_entry", false) || + GetBoolOptionOrDefault(field_type->options(), "map_entry", false); } void ProtoStreamObjectWriter::WriteTag(const google::protobuf::Field& field) { |