Commit 4c4aae87 authored by Hamdi Sahloul's avatar Hamdi Sahloul

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*
parent c34ed5c9
......@@ -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()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment