Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/protobuf-3.5.1.patch @ 5728:4acad0637cc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix build on VS2022
author Alain Mazy <alain@mazy.be>
date Thu, 25 Jul 2024 10:32:24 +0200
parents 4c6f0211caaf
children
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 @@
5728
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
5
5188
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 }
5728
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
16
5188
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:".
5728
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
18 diff -urEb protobuf-3.5.1.orig/src/google/protobuf/stubs/hash.h protobuf-3.5.1/src/google/protobuf/stubs/hash.h
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
19 --- protobuf-3.5.1.orig/src/google/protobuf/stubs/hash.h 2023-03-26 20:13:45.095021011 +0200
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
20 +++ protobuf-3.5.1/src/google/protobuf/stubs/hash.h 2023-03-26 20:19:19.932920102 +0200
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
21 @@ -1,3 +1,9 @@
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
22 +#if _MSC_VER >= 1930 // Since Visual Studio 2022
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
23 +#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
24 +#include <unordered_map>
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
25 +#include <hash_map>
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
26 +#endif
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
27 +
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
28 // Protocol Buffers - Google's data interchange format
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
29 // Copyright 2008 Google Inc. All rights reserved.
4acad0637cc6 fix build on VS2022
Alain Mazy <alain@mazy.be>
parents: 5188
diff changeset
30 // https://developers.google.com/protocol-buffers/