organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

VS2010 compatibility of address initalization

Browse source 
VS2010 cannot compile json_util_test.cc since it assumes NULL as a zero (int), and therefore cannot convert into to char*
This commit is contained in:
Hamdi Sahloul 2015-10-09 00:21:26 +09:00
parent c34ed5c9bf
commit 4c4aae87d5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google/protobuf/util/json_util_test.cc
View file

@ -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()) {