diff options
| author | Feng Xiao <xiaofeng@google.com> | 2015-10-08 13:30:10 -0700 |
|---|---|---|
| committer | Feng Xiao <xiaofeng@google.com> | 2015-10-08 13:30:10 -0700 |
| commit | 3f788364bf252b4e07823c0ae3b8d5881e35486c (patch) | |
| tree | cf8bee39fc9afbe5a855ad142162aff6684ad5ab | |
| parent | e2fb73af34c4b34abab8e2c4f4572ed28fca9973 (diff) | |
| parent | 4ead55c3704d3304999efc3cd99e9e77ba8a6e1c (diff) | |
| download | protobuf-3f788364bf252b4e07823c0ae3b8d5881e35486c.tar.gz protobuf-3f788364bf252b4e07823c0ae3b8d5881e35486c.tar.bz2 protobuf-3f788364bf252b4e07823c0ae3b8d5881e35486c.zip | |
Merge pull request #866 from Sahloul/patch-1
VS2010 compatibility of address initalization
| -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..da68495f 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_(static_cast<char*>(NULL), 0), byte_count_(0) {} virtual bool Next(void** buffer, int* length) { if (segments_.empty()) { |