diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-11-02 12:39:27 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-11-02 12:39:27 -0800 |
| commit | 9659ea9e56bfc34f67d7ce73f946d5b58183a833 (patch) | |
| tree | a54835fdafe97f9a7d96933b4cb3689eb31b726f /src/google/protobuf/util/internal/protostream_objectwriter.cc | |
| parent | 59635c13d9e9ce21ee7ee4c1493c3d437fc9d87c (diff) | |
Fix compilation errors when built internally.
1. mathlimits.h must be included before the inclusion of cmath (which
gtest/gtest.h seems to include).
2. hash function for StringPiece doesn't work.
Change-Id: I358a25d941a25b10b39fe76780eda41557699811
Diffstat (limited to 'src/google/protobuf/util/internal/protostream_objectwriter.cc')
| -rw-r--r-- | src/google/protobuf/util/internal/protostream_objectwriter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/internal/protostream_objectwriter.cc b/src/google/protobuf/util/internal/protostream_objectwriter.cc index 08a2fb9a..0958997c 100644 --- a/src/google/protobuf/util/internal/protostream_objectwriter.cc +++ b/src/google/protobuf/util/internal/protostream_objectwriter.cc @@ -602,7 +602,7 @@ void ProtoStreamObjectWriter::ProtoElement::TakeOneofIndex(int32 index) { bool ProtoStreamObjectWriter::ProtoElement::InsertMapKeyIfNotPresent( StringPiece map_key) { - return InsertIfNotPresent(&map_keys_, map_key); + return InsertIfNotPresent(&map_keys_, map_key.ToString()); } inline void ProtoStreamObjectWriter::InvalidName(StringPiece unknown_name, |