Mercurial > hg > orthanc

comparison 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
comparison
equal deleted inserted replaced
5727:843973a0fdfa 5728:4acad0637cc6
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 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 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 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 @@ 4 @@ -91,7 +91,12 @@
5 5
6 template <typename char_type> 6 template <typename char_type>
7 bool null_or_empty(const char_type* s) { 7 bool null_or_empty(const char_type* s) {
8 - return s == nullptr || *s == 0; 8 - return s == nullptr || *s == 0;
9 + /** 9 + /**
10 + * "nullptr" is not known to Visual Studio 2008, because this is a 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 11 + * C++11 construction, which shouldn't be present in protobuf 3.5.1
12 + * that is supposed to comply with C++98. 12 + * that is supposed to comply with C++98.
13 + **/ 13 + **/
14 + return s == NULL || *s == 0; 14 + return s == NULL || *s == 0;
15 } 15 }
16 16
17 // Returns true if the path starts with a drive letter, e.g. "c:". 17 // Returns true if the path starts with a drive letter, e.g. "c:".
18 diff -urEb protobuf-3.5.1.orig/src/google/protobuf/stubs/hash.h protobuf-3.5.1/src/google/protobuf/stubs/hash.h
19 --- protobuf-3.5.1.orig/src/google/protobuf/stubs/hash.h 2023-03-26 20:13:45.095021011 +0200
20 +++ protobuf-3.5.1/src/google/protobuf/stubs/hash.h 2023-03-26 20:19:19.932920102 +0200
21 @@ -1,3 +1,9 @@
22 +#if _MSC_VER >= 1930 // Since Visual Studio 2022
23 +#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
24 +#include <unordered_map>
25 +#include <hash_map>
26 +#endif
27 +
28 // Protocol Buffers - Google's data interchange format
29 // Copyright 2008 Google Inc. All rights reserved.
30 // https://developers.google.com/protocol-buffers/