From 1febb12942151a6a8676e011561b214e02291877 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 4 Jun 2019 12:50:40 +0300 Subject: [PATCH] 3rdparty: apply protobuf v3.5.1..v3.5.2 patch https://github.com/protocolbuffers/protobuf/compare/v3.5.1..v3.5.2 --- 3rdparty/protobuf/README.md | 4 ++-- 3rdparty/protobuf/src/google/protobuf/stubs/io_win32.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/protobuf/README.md b/3rdparty/protobuf/README.md index e0edb75..3040403 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 ad2d2d2..b59b8e4 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:". -- 2.7.4