Commit 3f788364 authored by Feng Xiao's avatar Feng Xiao

Merge pull request #866 from Sahloul/patch-1

VS2010 compatibility of address initalization
parents e2fb73af 4ead55c3
...@@ -163,7 +163,7 @@ typedef pair<char*, int> Segment; ...@@ -163,7 +163,7 @@ typedef pair<char*, int> Segment;
class SegmentedZeroCopyOutputStream : public io::ZeroCopyOutputStream { class SegmentedZeroCopyOutputStream : public io::ZeroCopyOutputStream {
public: public:
explicit SegmentedZeroCopyOutputStream(list<Segment> segments) 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) { virtual bool Next(void** buffer, int* length) {
if (segments_.empty()) { 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