diff options
| author |  Hamdi Sahloul <sahloul@race.u-tokyo.ac.jp> | 2015-10-09 00:21:26 +0900 |
|---|---|---|
| committer | Hamdi Sahloul <sahloul@race.u-tokyo.ac.jp> | 2015-10-09 00:21:26 +0900 |
| commit | 4c4aae87d5a799553931c63fd53eeed36397532c (patch) | |
| tree | d67d24454f20ba78c5554fb80bb989f799ac7256 /src | |
| parent | c34ed5c9bfd0577ccb00e259a8fc8f924a356819 (diff) | |
VS2010 compatibility of address initalization
VS2010 cannot compile json_util_test.cc since it assumes NULL as a zero (int), and therefore cannot convert into to char*
Diffstat (limited to 'src')
| -rw-r--r-- | src/google/protobuf/util/json_util_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/util/json_util_test.cc b/src/google/protobuf/util/json_util_test.cc index f4dc3562..2da06a7c 100644 --- a/src/google/protobuf/util/json_util_test.cc +++ b/src/google/protobuf/util/json_util_test.cc @@ -163,7 +163,7 @@ typedef pair<char*, int> Segment; class SegmentedZeroCopyOutputStream : public io::ZeroCopyOutputStream { public: explicit SegmentedZeroCopyOutputStream(list<Segment> segments) - : segments_(segments), last_segment_(NULL, 0), byte_count_(0) {} + : segments_(segments), last_segment_((char*)NULL, 0), byte_count_(0) {} virtual bool Next(void** buffer, int* length) { if (segments_.empty()) { |