diff options
| author | Hamdi Sahloul <sahloul@race.u-tokyo.ac.jp> | 2015-10-09 05:10:30 +0900 |
|---|---|---|
| committer | Hamdi Sahloul <sahloul@race.u-tokyo.ac.jp> | 2015-10-09 05:10:30 +0900 |
| commit | 4ead55c3704d3304999efc3cd99e9e77ba8a6e1c (patch) | |
| tree | f81322eec3695a7f87abcd4ff8a308b992bde3cb /src/google/protobuf/util/json_util_test.cc | |
| parent | 4c4aae87d5a799553931c63fd53eeed36397532c (diff) | |
| download | protobuf-4ead55c3704d3304999efc3cd99e9e77ba8a6e1c.tar.gz protobuf-4ead55c3704d3304999efc3cd99e9e77ba8a6e1c.tar.bz2 protobuf-4ead55c3704d3304999efc3cd99e9e77ba8a6e1c.zip | |
Use static cast
Used static cast to improve initalization compatibility with MSVC2010
Diffstat (limited to 'src/google/protobuf/util/json_util_test.cc')
| -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()) { |