From 9659ea9e56bfc34f67d7ce73f946d5b58183a833 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Mon, 2 Nov 2015 12:39:27 -0800 Subject: 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 --- src/google/protobuf/util/internal/protostream_objectwriter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/google/protobuf/util/internal/protostream_objectwriter.h') 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 map_keys_; + hash_set map_keys_; GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(ProtoElement); }; -- cgit v1.2.3