From 967117e7d88a9c521e4ce9bdd28a888c740e9afd Mon Sep 17 00:00:00 2001 From: Geoff Phillips Date: Mon, 19 Jun 2023 19:27:11 +0200 Subject: [PATCH] Fix Windows clang build --- .../include/aws/core/http/windows/WinHttpConnectionPoolMgr.h | 2 +- .../include/aws/core/http/windows/WinSyncHttpClient.h | 2 +- .../include/aws/core/utils/crypto/bcrypt/CryptoImpl.h | 2 +- src/aws-cpp-sdk-core/include/smithy/tracing/TraceSpan.h | 2 +- src/aws-cpp-sdk-core/include/smithy/tracing/Tracer.h | 2 +- .../source/http/windows/WinHttpSyncHttpClient.cpp | 4 +--- .../source/http/windows/WinINetSyncHttpClient.cpp | 4 +--- .../source/http/windows/WinSyncHttpClient.cpp | 5 ++--- .../source/utils/crypto/bcrypt/CryptoImpl.cpp | 2 -- 9 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/aws-cpp-sdk-core/include/aws/core/http/windows/WinHttpConnectionPoolMgr.h b/src/aws-cpp-sdk-core/include/aws/core/http/windows/WinHttpConnectionPoolMgr.h index df4d99f6547..a501cdbb7d8 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/http/windows/WinHttpConnectionPoolMgr.h +++ b/src/aws-cpp-sdk-core/include/aws/core/http/windows/WinHttpConnectionPoolMgr.h @@ -34,7 +34,7 @@ namespace Aws /** * Gets the log tag to use for logging in the base class. */ - const char* GetLogTag() const { return "WinHttpConnectionPoolMgr"; } + const char* GetLogTag() const override { return "WinHttpConnectionPoolMgr"; } private: virtual void DoCloseHandle(void* handle) const override; diff --git a/src/aws-cpp-sdk-core/include/aws/core/http/windows/WinSyncHttpClient.h b/src/aws-cpp-sdk-core/include/aws/core/http/windows/WinSyncHttpClient.h index 2764099a4e3..e3a29a169d9 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/http/windows/WinSyncHttpClient.h +++ b/src/aws-cpp-sdk-core/include/aws/core/http/windows/WinSyncHttpClient.h @@ -7,7 +7,7 @@ #include -#include +#include #include #include #include diff --git a/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h b/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h index e26e36b6053..20ee7483c75 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h +++ b/src/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h @@ -209,7 +209,7 @@ namespace Aws /** * Initialize with key and initializationVector, set tag for decryption of authenticated modes (move the buffers) */ - BCryptSymmetricCipher(CryptoBuffer&& key, CryptoBuffer&& initializationVector, CryptoBuffer&& tag = std::move(CryptoBuffer(0))); + BCryptSymmetricCipher(CryptoBuffer&& key, CryptoBuffer&& initializationVector, CryptoBuffer&& tag = CryptoBuffer(0)); BCryptSymmetricCipher(const BCryptSymmetricCipher&) = delete; BCryptSymmetricCipher& operator=(const BCryptSymmetricCipher&) = delete; diff --git a/src/aws-cpp-sdk-core/include/smithy/tracing/TraceSpan.h b/src/aws-cpp-sdk-core/include/smithy/tracing/TraceSpan.h index bdb5bb0ec5f..bb6ebd542f8 100644 --- a/src/aws-cpp-sdk-core/include/smithy/tracing/TraceSpan.h +++ b/src/aws-cpp-sdk-core/include/smithy/tracing/TraceSpan.h @@ -16,7 +16,7 @@ namespace smithy { /** * Status of the span. */ - enum class SMITHY_API TraceSpanStatus { + enum class TraceSpanStatus { UNSET, OK, ERROR, diff --git a/src/aws-cpp-sdk-core/include/smithy/tracing/Tracer.h b/src/aws-cpp-sdk-core/include/smithy/tracing/Tracer.h index 9de0e6c696c..fd48a3c02f7 100644 --- a/src/aws-cpp-sdk-core/include/smithy/tracing/Tracer.h +++ b/src/aws-cpp-sdk-core/include/smithy/tracing/Tracer.h @@ -14,7 +14,7 @@ namespace smithy { /** * The kind of span being created. */ - enum class SMITHY_API SpanKind { + enum class SpanKind { INTERNAL, CLIENT, SERVER, diff --git a/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp b/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp index b4a9b5fbd72..c5fd138faa5 100644 --- a/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp +++ b/src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include #include #include @@ -28,8 +28,6 @@ using namespace Aws::Http::Standard; using namespace Aws::Utils; using namespace Aws::Utils::Logging; -static const uint32_t HTTP_REQUEST_WRITE_BUFFER_LENGTH = 8192; - static void WinHttpEnableHttp2(void* handle) { #ifdef WINHTTP_HAS_H2 diff --git a/src/aws-cpp-sdk-core/source/http/windows/WinINetSyncHttpClient.cpp b/src/aws-cpp-sdk-core/source/http/windows/WinINetSyncHttpClient.cpp index 5854cc3342d..0c192974a5d 100644 --- a/src/aws-cpp-sdk-core/source/http/windows/WinINetSyncHttpClient.cpp +++ b/src/aws-cpp-sdk-core/source/http/windows/WinINetSyncHttpClient.cpp @@ -5,7 +5,7 @@ #include -#include +#include #include #include #include @@ -27,8 +27,6 @@ using namespace Aws::Http::Standard; using namespace Aws::Utils; using namespace Aws::Utils::Logging; -static const uint32_t HTTP_REQUEST_WRITE_BUFFER_LENGTH = 8192; - static void WinINetEnableHttp2(void* handle) { #ifdef WININET_HAS_H2 diff --git a/src/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp b/src/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp index d7513cc3c85..dfcab2e56e0 100644 --- a/src/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp +++ b/src/aws-cpp-sdk-core/source/http/windows/WinSyncHttpClient.cpp @@ -4,7 +4,7 @@ */ #include -#include +#include #include #include #include @@ -27,7 +27,6 @@ using namespace Aws::Utils; using namespace Aws::Utils::Logging; static const uint32_t HTTP_REQUEST_WRITE_BUFFER_LENGTH = 8192; -static const char CLASS_TAG[] = "WinSyncHttpClient"; WinSyncHttpClient::~WinSyncHttpClient() { @@ -349,7 +348,7 @@ std::shared_ptr WinSyncHttpClient::MakeRequest(const std::shared_p } } - if (!success && !IsRequestProcessingEnabled() || !ContinueRequest(*request)) + if ((!success && !IsRequestProcessingEnabled()) || !ContinueRequest(*request)) { response->SetClientErrorType(CoreErrors::USER_CANCELLED); response->SetClientErrorMessage("Request processing disabled or continuation cancelled by user's continuation handler."); diff --git a/src/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CryptoImpl.cpp b/src/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CryptoImpl.cpp index 1ae7e2266f4..2307fd451ab 100644 --- a/src/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CryptoImpl.cpp +++ b/src/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CryptoImpl.cpp @@ -932,7 +932,6 @@ namespace Aws { return CryptoBuffer(); } - size_t bytesWritten = 0; Aws::Vector finalBufferSet(0); CryptoBuffer bufferToEncrypt; @@ -984,7 +983,6 @@ namespace Aws *newBuffer = slicedBuffers[i] ^ encryptedText; finalBufferSet[i] = newBuffer; m_workingIv = IncrementCTRCounter(m_workingIv, 1); - bytesWritten += static_cast(lengthWritten); } else {