From fa61fc4f9cb9d9a5ea13eefc0eb7afeb26da0a9d Mon Sep 17 00:00:00 2001 From: Dentomologist Date: Wed, 3 Mar 2021 16:31:33 -0800 Subject: [PATCH] Fix shadowing warnings Fixes type/variable shadowing warnings on debian and ubuntu --- Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp | 2 +- Source/Core/Core/NetworkCaptureLogger.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp index 122b5f6f71..32b4189321 100644 --- a/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp +++ b/Source/Core/Core/IOS/SDIO/SDIOSlot0.cpp @@ -146,7 +146,7 @@ s32 SDIOSlot0Device::ExecuteCommand(const Request& request, u32 buffer_in, u32 b { // The game will send us a SendCMD with this information. To be able to read and write // to a file we need to prepare a 0x10 byte output buffer as response. - struct Request + struct { u32 command; u32 type; diff --git a/Source/Core/Core/NetworkCaptureLogger.cpp b/Source/Core/Core/NetworkCaptureLogger.cpp index 118deb234a..22dee582fe 100644 --- a/Source/Core/Core/NetworkCaptureLogger.cpp +++ b/Source/Core/Core/NetworkCaptureLogger.cpp @@ -186,8 +186,8 @@ void PCAPSSLCaptureLogger::LogIPv4(LogType log_type, const u8* data, u16 length, } std::vector packet; - auto insert = [&](const auto* data, std::size_t size) { - const u8* begin = reinterpret_cast(data); + auto insert = [&](const auto* new_data, std::size_t size) { + const u8* begin = reinterpret_cast(new_data); packet.insert(packet.end(), begin, begin + size); };