# HG changeset patch
# User Alain Mazy <am@orthanc.team>
# Date 1722004178 -7200
# Node ID f0ab7a2678fef8b4037a359548f59261e1b6dbc8
# Parent  bdbaccc06e9865705352e17c3a5ff7ab4e2aae51# Parent  4acad0637cc652f236bbb0eb334d78dcc6135951
merge

diff -r bdbaccc06e98 -r f0ab7a2678fe OrthancFramework/Resources/Patches/protobuf-3.5.1.patch
--- a/OrthancFramework/Resources/Patches/protobuf-3.5.1.patch	Fri Jul 26 16:29:10 2024 +0200
+++ b/OrthancFramework/Resources/Patches/protobuf-3.5.1.patch	Fri Jul 26 16:29:38 2024 +0200
@@ -2,7 +2,7 @@
 --- protobuf-3.5.1.orig/src/google/protobuf/stubs/io_win32.cc	2023-03-26 20:13:45.095021011 +0200
 +++ protobuf-3.5.1/src/google/protobuf/stubs/io_win32.cc	2023-03-26 20:19:19.932920102 +0200
 @@ -91,7 +91,12 @@
- 
+
  template <typename char_type>
  bool null_or_empty(const char_type* s) {
 -  return s == nullptr || *s == 0;
@@ -13,5 +13,18 @@
 +   **/
 +  return s == NULL || *s == 0;
  }
- 
+
  // Returns true if the path starts with a drive letter, e.g. "c:".
+diff -urEb protobuf-3.5.1.orig/src/google/protobuf/stubs/hash.h protobuf-3.5.1/src/google/protobuf/stubs/hash.h
+--- protobuf-3.5.1.orig/src/google/protobuf/stubs/hash.h	2023-03-26 20:13:45.095021011 +0200
++++ protobuf-3.5.1/src/google/protobuf/stubs/hash.h	2023-03-26 20:19:19.932920102 +0200
+@@ -1,3 +1,9 @@
++#if _MSC_VER >= 1930       // Since Visual Studio 2022
++#define _SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS
++#include <unordered_map>
++#include <hash_map>
++#endif
++
+ // Protocol Buffers - Google's data interchange format
+ // Copyright 2008 Google Inc.  All rights reserved.
+ // https://developers.google.com/protocol-buffers/
\ No newline at end of file