From 55aa1ff66e80a22338bdf30f7256ff985a6e1b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 6 Nov 2024 11:58:06 +0100 Subject: [PATCH] Warning fixes --- CMakeLists.txt | 8 ++++++-- Common/Render/Text/draw_text_win.cpp | 1 + Core/Debugger/WebSocket/ClientConfigSubscriber.cpp | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb500f10a0..0428b487dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,8 +383,12 @@ if(NOT MSVC) add_definitions(-DPNG_ARM_NEON_OPT=0) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type -Wno-unused-function -Wno-sign-compare -Wno-unused-but-set-variable -Wno-reorder -Wno-unknown-pragmas -Wno-unused-value -Wno-unused-variable") - # This one is very useful but has many false positives. - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess") + if(NOT CLANG) + # This one is very useful but has many false positives. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-class-memaccess") + else() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") + endif() if(ANDROID) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17") diff --git a/Common/Render/Text/draw_text_win.cpp b/Common/Render/Text/draw_text_win.cpp index 28a8aeb4f0..acec4b4a7c 100644 --- a/Common/Render/Text/draw_text_win.cpp +++ b/Common/Render/Text/draw_text_win.cpp @@ -178,6 +178,7 @@ bool TextDrawerWin32::DrawStringBitmap(std::vector &bitmapData, TextStr if (size.cx == 0 || size.cy == 0) { // Don't draw zero-sized textures. + WARN_LOG(Log::G3D, "Text '%.*s' caused a zero size image", (int)str.length(), str.data()); return false; } diff --git a/Core/Debugger/WebSocket/ClientConfigSubscriber.cpp b/Core/Debugger/WebSocket/ClientConfigSubscriber.cpp index 9f8ca67278..1a1c9c7955 100644 --- a/Core/Debugger/WebSocket/ClientConfigSubscriber.cpp +++ b/Core/Debugger/WebSocket/ClientConfigSubscriber.cpp @@ -43,7 +43,7 @@ void WebSocketBroadcastConfigGet(DebuggerRequest & req) { json.pushDict("disallowed"); - for (const auto[name, status] : disallowed_config) { + for (const auto &[name, status] : disallowed_config) { if (status) json.writeBool(name, true); } @@ -97,7 +97,7 @@ void WebSocketBroadcastConfigSet(DebuggerRequest & req) { json.pushDict("disallowed"); - for (const auto[name, status] : disallowed_config) { + for (const auto &[name, status] : disallowed_config) { if (status) json.writeBool(name, true); }