aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/util/internal
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2015-11-02 12:39:27 -0800
committerGravatar Feng Xiao <xfxyjwf@gmail.com>2015-11-02 12:39:27 -0800
commit9659ea9e56bfc34f67d7ce73f946d5b58183a833 (patch)
treea54835fdafe97f9a7d96933b4cb3689eb31b726f /src/google/protobuf/util/internal
parent59635c13d9e9ce21ee7ee4c1493c3d437fc9d87c (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')
-rw-r--r--src/google/protobuf/util/internal/protostream_objectwriter.cc2
-rw-r--r--src/google/protobuf/util/internal/protostream_objectwriter.h2
2 files changed, 2 insertions, 2 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,
diff --git a/src/google/protobuf/util/internal/protostream_objectwriter.h b/src/google/protobuf/util/internal/protostream_objectwriter.h
index 19f747fe..6e133679 100644
--- a/src/google/protobuf/util/internal/protostream_objectwriter.h
+++ b/src/google/protobuf/util/internal/protostream_objectwriter.h
@@ -305,7 +305,7 @@ class LIBPROTOBUF_EXPORT ProtoStreamObjectWriter : public StructuredObjectWriter
// Set of map keys already seen for the type_. Used to validate incoming
// messages so no map key appears more than once.
- hash_set<StringPiece> map_keys_;
+ hash_set<string> map_keys_;
GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(ProtoElement);
};