Skip to content

Fix Clang Compatibility and Remove Unused Variables #3728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eranif wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −9
Open

Fix Clang Compatibility and Remove Unused Variables #3728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/aws-cpp-sdk-core/include/aws/core/utils/event/EventHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <aws/event-stream/event_stream.h>
#include <cassert>

#ifdef __MINGW32__
#if defined(__MINGW32__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#pragma GCC diagnostic ignored "-Wuninitialized"
Expand Down Expand Up @@ -357,6 +357,6 @@ namespace Aws
}
}

#ifdef __MINGW32__
#if defined(__MINGW32__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif
6 changes: 3 additions & 3 deletions src/aws-cpp-sdk-core/source/http/windows/WinHttpSyncHttpClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ static void CALLBACK WinHttpSyncLogCallback(HINTERNET hInternet,
};

bool found = false;
int i;
size_t i;
for (i = 0; i < sizeof(KNOWN_STATUSES) / sizeof(KNOWN_STATUSES[0]) && !found; i++)
{
if (dwInternetStatus == KNOWN_STATUSES[i].status)
Expand Down Expand Up @@ -402,8 +402,8 @@ WinHttpSyncHttpClient::WinHttpSyncHttpClient(const ClientConfiguration& config)
Base(),
m_usingProxy(!config.proxyHost.empty()),
m_verifySSL(config.verifySSL),
m_version(config.version),
m_useAnonymousAuth(config.winHTTPOptions.useAnonymousAuth)
m_useAnonymousAuth(config.winHTTPOptions.useAnonymousAuth),
m_version(config.version)
{
m_enableHttpClientTrace = config.enableHttpClientTrace;

Expand Down
2 changes: 0 additions & 2 deletions src/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ Aws::String ComputeOSVersionString()
static const char* FILE_TO_CHECK = "Kernel32.dll";
DWORD fileVersionSize = GetFileVersionInfoSizeA(FILE_TO_CHECK, &uselessParameter);
void* blob = Aws::Malloc("OSVersionInfo", static_cast<size_t>(fileVersionSize));
bool versionFound(false);

if (GetFileVersionInfoA(FILE_TO_CHECK, 0, fileVersionSize, blob))
{
Expand All @@ -95,7 +94,6 @@ Aws::String ComputeOSVersionString()
if (VerQueryValueA(blob, codePageSS.str().c_str(), &subBlock, &subBlockSize))
{
ss << "#" << static_cast<const char*>(subBlock);
versionFound = true;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/aws-cpp-sdk-core-tests/aws/auth/GeneralHTTPCredentialsProviderTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <aws/core/platform/Environment.h>
#include <aws/core/platform/FileSystem.h>

#if defined(_WIN32)
#if defined(_WIN32) && !defined(__clang__)
// disable "warning C4702: unreachable code" from GTEST_SKIP on newer MSVS
#pragma warning(disable: 4702)
#endif
Expand Down
2 changes: 1 addition & 1 deletion tests/testing-resources/include/aws/testing/AwsCppSdkGTestSuite.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <aws/core/Aws.h>

#if defined(_WIN32)
#if defined(_WIN32) && !defined(__clang__)
// disable "warning C4702: unreachable code" from GTEST_SKIP on newer MSVS
#pragma warning(disable: 4702)
#endif
Expand Down
Loading