Ver Fonte

VS2010 compatibility of address initalization

VS2010 cannot compile json_util_test.cc since it assumes NULL as a zero (int), and therefore cannot convert into to char*
Hamdi Sahloul há 10 anos atrás
pai
commit
4c4aae87d5
1 ficheiros alterados com 1 adições e 1 exclusões
  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 {
 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_((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()) {