Mercurial > hg > orthanc-object-storage

annotate Aws/aws-sdk-cpp-1.11.178.patch @ 197:df0b6998fd27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration 2.3.0: back to mainline
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 25 Jun 2024 12:38:31 +0200
parents d3e7c86c3a4e
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
160
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
1 Only in aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/include/aws/core: SDKConfig.h
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
2 diff -urEb aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-core/include/aws/core/utils/Array.h aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/include/aws/core/utils/Array.h
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
3 --- aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-core/include/aws/core/utils/Array.h 2023-10-06 20:16:49.000000000 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
4 +++ aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/include/aws/core/utils/Array.h 2024-06-23 10:47:33.294537700 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
5 @@ -14,7 +14,7 @@
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
6 #include <cstring>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
7 #include <algorithm>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
8
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
9 -#ifdef _WIN32
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
10 +#ifdef _MSC_VER
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
11
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
12 #include <iterator>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
13
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
14 @@ -54,7 +54,7 @@
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
15 {
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
16 m_data.reset(Aws::NewArray<T>(m_size, ARRAY_ALLOCATION_TAG));
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
17
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
18 -#ifdef _WIN32
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
19 +#ifdef _MSC_VER
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
20 std::copy(arrayToCopy, arrayToCopy + arraySize, stdext::checked_array_iterator< T * >(m_data.get(), m_size));
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
21 #else
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
22 std::copy(arrayToCopy, arrayToCopy + arraySize, m_data.get());
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
23 @@ -82,7 +82,7 @@
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
24 if(arr->m_size > 0 && arr->m_data)
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
25 {
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
26 size_t arraySize = arr->m_size;
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
27 -#ifdef _WIN32
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
28 +#ifdef _MSC_VER
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
29 std::copy(arr->m_data.get(), arr->m_data.get() + arraySize, stdext::checked_array_iterator< T * >(m_data.get() + location, m_size));
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
30 #else
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
31 std::copy(arr->m_data.get(), arr->m_data.get() + arraySize, m_data.get() + location);
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
32 @@ -101,7 +101,7 @@
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
33 {
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
34 m_data.reset(Aws::NewArray<T>(m_size, ARRAY_ALLOCATION_TAG));
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
35
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
36 -#ifdef _WIN32
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
37 +#ifdef _MSC_VER
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
38 std::copy(other.m_data.get(), other.m_data.get() + other.m_size, stdext::checked_array_iterator< T * >(m_data.get(), m_size));
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
39 #else
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
40 std::copy(other.m_data.get(), other.m_data.get() + other.m_size, m_data.get());
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
41 @@ -134,7 +134,7 @@
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
42 {
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
43 m_data.reset(Aws::NewArray<T>(m_size, ARRAY_ALLOCATION_TAG));
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
44
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
45 -#ifdef _WIN32
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
46 +#ifdef _MSC_VER
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
47 std::copy(other.m_data.get(), other.m_data.get() + other.m_size, stdext::checked_array_iterator< T * >(m_data.get(), m_size));
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
48 #else
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
49 std::copy(other.m_data.get(), other.m_data.get() + other.m_size, m_data.get());
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
50 Only in aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/include/aws/core/utils: Array.h~
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
51 diff -urEb aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
52 --- aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp 2023-10-06 20:16:49.000000000 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
53 +++ aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/source/platform/windows/FileSystem.cpp 2024-06-22 19:00:43.200750034 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
54 @@ -10,7 +10,7 @@
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
55 #include <aws/core/utils/memory/stl/AWSVector.h>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
56 #include <cassert>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
57 #include <iostream>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
58 -#include <Userenv.h>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
59 +#include <userenv.h>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
60
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
61 #pragma warning( disable : 4996)
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
62
146
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 diff -urEb aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-core/source/utils/crypto/openssl/CryptoImpl.cpp aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/source/utils/crypto/openssl/CryptoImpl.cpp
160
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
64 --- aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-core/source/utils/crypto/openssl/CryptoImpl.cpp 2023-10-06 20:16:49.000000000 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
65 +++ aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/source/utils/crypto/openssl/CryptoImpl.cpp 2024-06-22 18:38:51.196880348 +0200
146
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 @@ -221,7 +221,7 @@
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 EVP_DigestInit_ex(ctx, EVP_md5(), nullptr);
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 auto currentPos = stream.tellg();
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70 - if (currentPos == -1)
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71 + if (currentPos == std::streampos(-1))
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 {
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 currentPos = 0;
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 stream.clear();
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 @@ -298,7 +298,7 @@
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 EVP_DigestInit_ex(ctx, EVP_sha1(), nullptr);
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 auto currentPos = stream.tellg();
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 - if (currentPos == -1)
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 + if (currentPos == std::streampos(-1))
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 {
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 currentPos = 0;
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 stream.clear();
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 @@ -376,7 +376,7 @@
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 EVP_DigestInit_ex(ctx, EVP_sha256(), nullptr);
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 auto currentPos = stream.tellg();
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 - if (currentPos == -1)
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
89 + if (currentPos == std::streampos(-1))
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
90 {
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
91 currentPos = 0;
5decdf0f0ef7 trying to build aws for windows
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 stream.clear();
160
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
93 diff -urEb aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-core/source/utils/StringUtils.cpp aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/source/utils/StringUtils.cpp
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
94 --- aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-core/source/utils/StringUtils.cpp 2023-10-06 20:16:49.000000000 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
95 +++ aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-core/source/utils/StringUtils.cpp 2024-06-22 18:55:21.912052713 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
96 @@ -14,7 +14,7 @@
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
97 #include <functional>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
98
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
99 #ifdef _WIN32
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
100 -#include <Windows.h>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
101 +#include <windows.h>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
102 #endif
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
103
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
104 using namespace Aws::Utils;
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
105 diff -urEb aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-text-to-speech/include/aws/text-to-speech/windows/WaveOutPCMOutputDriver.h aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-text-to-speech/include/aws/text-to-speech/windows/WaveOutPCMOutputDriver.h
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
106 --- aws-sdk-cpp-1.11.178.orig/src/aws-cpp-sdk-text-to-speech/include/aws/text-to-speech/windows/WaveOutPCMOutputDriver.h 2023-10-06 20:16:49.000000000 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
107 +++ aws-sdk-cpp-1.11.178/src/aws-cpp-sdk-text-to-speech/include/aws/text-to-speech/windows/WaveOutPCMOutputDriver.h 2024-06-22 18:57:00.963064735 +0200
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
108 @@ -10,7 +10,7 @@
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
109
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
110 #include <mutex>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
111
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
112 -#include <Windows.h>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
113 +#include <windows.h>
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
114
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
115 namespace Aws
d3e7c86c3a4e added patch to build using mingw
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 146
diff changeset
116 {