diff --git a/3rdparty/protobuf/README.md b/3rdparty/protobuf/README.md index e0edb75f58..30404036a8 100644 --- a/3rdparty/protobuf/README.md +++ b/3rdparty/protobuf/README.md @@ -1,3 +1,3 @@ Project: Protocol Buffers - Google's data interchange format -Source code: https://github.com/google/protobuf -Version: 3.5.1 +Source code: https://github.com/protocolbuffers/protobuf +Version: 3.5.2 diff --git a/3rdparty/protobuf/src/google/protobuf/stubs/io_win32.cc b/3rdparty/protobuf/src/google/protobuf/stubs/io_win32.cc index ad2d2d265e..b59b8e487b 100644 --- a/3rdparty/protobuf/src/google/protobuf/stubs/io_win32.cc +++ b/3rdparty/protobuf/src/google/protobuf/stubs/io_win32.cc @@ -91,7 +91,7 @@ struct CharTraits { template bool null_or_empty(const char_type* s) { - return s == nullptr || *s == 0; + return s == NULL || *s == 0; } // Returns true if the path starts with a drive letter, e.g. "c:".