Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/protobuf-3.5.1.patch @ 5489:50910d241dd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for mingw
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jan 2024 18:36:55 +0100
parents 4c6f0211caaf
children 4acad0637cc6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5188
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
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
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- protobuf-3.5.1.orig/src/google/protobuf/stubs/io_win32.cc 2023-03-26 20:13:45.095021011 +0200
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ protobuf-3.5.1/src/google/protobuf/stubs/io_win32.cc 2023-03-26 20:19:19.932920102 +0200
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -91,7 +91,12 @@
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 template <typename char_type>
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 bool null_or_empty(const char_type* s) {
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 - return s == nullptr || *s == 0;
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 + /**
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 + * "nullptr" is not known to Visual Studio 2008, because this is a
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 + * C++11 construction, which shouldn't be present in protobuf 3.5.1
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 + * that is supposed to comply with C++98.
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 + **/
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 + return s == NULL || *s == 0;
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 }
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16
4c6f0211caaf compiling the protobuf compiler
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 // Returns true if the path starts with a drive letter, e.g. "c:".