diff options
Diffstat (limited to 'src/google/protobuf/util')
| -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 2da06a7c..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_((char*)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()) { |