Browse Source

Merge pull request #866 from Sahloul/patch-1

VS2010 compatibility of address initalization
Feng Xiao 10 years ago
parent
commit
3f788364bf
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/google/protobuf/util/json_util_test.cc

+ 1 - 1
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_(static_cast<char*>(NULL), 0), byte_count_(0) {}
 
   virtual bool Next(void** buffer, int* length) {
     if (segments_.empty()) {