Mercurial > hg > orthanc

comparison OrthancFramework/Resources/Patches/protobuf-3.5.1.patch @ 5188:4c6f0211caaf db-protobuf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compiling the protobuf compiler
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 26 Mar 2023 21:09:13 +0200
parents
children
comparison
equal deleted inserted replaced
5187:9466c95f70c8 5188:4c6f0211caaf
1 diff -urEb protobuf-3.5.1.orig/src/google/protobuf/stubs/io_win32.cc protobuf-3.5.1/src/google/protobuf/stubs/io_win32.cc
2 --- protobuf-3.5.1.orig/src/google/protobuf/stubs/io_win32.cc 2023-03-26 20:13:45.095021011 +0200
3 +++ protobuf-3.5.1/src/google/protobuf/stubs/io_win32.cc 2023-03-26 20:19:19.932920102 +0200
4 @@ -91,7 +91,12 @@
5
6 template <typename char_type>
7 bool null_or_empty(const char_type* s) {
8 - return s == nullptr || *s == 0;
9 + /**
10 + * "nullptr" is not known to Visual Studio 2008, because this is a
11 + * C++11 construction, which shouldn't be present in protobuf 3.5.1
12 + * that is supposed to comply with C++98.
13 + **/
14 + return s == NULL || *s == 0;
15 }
16
17 // Returns true if the path starts with a drive letter, e.g. "c:".