From 19f80279af08357740427c876c62bdfa90d671b7 Mon Sep 17 00:00:00 2001 From: pifopi Date: Sun, 15 Jun 2025 22:28:51 +0200 Subject: [PATCH] Readd dpp warning silence --- 3rdParty/dpp/DPP_SilenceWarnings.h | 26 +++++++++++++++++++ .../Source/CommonFramework/Main.cpp | 1 + .../Notifications/ProgramNotifications.cpp | 1 + .../DiscordIntegrationSettings.cpp | 1 + .../Integrations/DppIntegration/DppClient.cpp | 1 + .../DppIntegration/DppCommandHandler.cpp | 1 + .../DppIntegration/DppUtility.cpp | 1 + 7 files changed, 32 insertions(+) create mode 100644 3rdParty/dpp/DPP_SilenceWarnings.h diff --git a/3rdParty/dpp/DPP_SilenceWarnings.h b/3rdParty/dpp/DPP_SilenceWarnings.h new file mode 100644 index 0000000000..04f06770db --- /dev/null +++ b/3rdParty/dpp/DPP_SilenceWarnings.h @@ -0,0 +1,26 @@ +/* Silence Warnings for DPP Headers + * + * From: https://github.com/PokemonAutomation/ + * + * Include this before every DPP header to silence warnings in those headers. + * + */ + +#ifndef PokemonAutomation_3rdParty_DPP_SilenceWarnings_H +#define PokemonAutomation_3rdParty_DPP_SilenceWarnings_H + + +#if 0 +#elif _MSC_VER + +#pragma warning(disable:4100) // Unreferenced Formal Parameter +#pragma warning(disable:4251) // dll-interface + +#elif __GNUC__ + +#pragma GCC diagnostic ignored "-Wunused-parameter" + +#endif + + +#endif diff --git a/SerialPrograms/Source/CommonFramework/Main.cpp b/SerialPrograms/Source/CommonFramework/Main.cpp index 6765e5177b..1989dd1af7 100644 --- a/SerialPrograms/Source/CommonFramework/Main.cpp +++ b/SerialPrograms/Source/CommonFramework/Main.cpp @@ -4,6 +4,7 @@ #include //#include #include +#include #include #include "Common/Cpp/Exceptions.h" #include "Common/Cpp/ImageResolution.h" diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp index 76aecde236..7935ab6c05 100644 --- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp +++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp @@ -5,6 +5,7 @@ */ #include +#include #include #include "Common/Cpp/PrettyPrint.h" #include "Common/Cpp/Json/JsonValue.h" diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp index 1c391f1ba9..6f058a4c8a 100644 --- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp +++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include "Common/Qt/StringToolsQt.h" //#include "CommonFramework/Globals.h" //#include "CommonFramework/GlobalSettingsPanel.h" diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp index 8b3e0329c0..feb3313cb5 100644 --- a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp +++ b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp @@ -1,6 +1,7 @@ #ifdef PA_DPP #include +#include #include #include #include diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp index 5169e477a8..d992bad3ed 100644 --- a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp +++ b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp @@ -1,6 +1,7 @@ #ifdef PA_DPP #include +#include #include #include "Common/Cpp/Concurrency/ScheduledTaskRunner.h" #include "CommonFramework/Globals.h" diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp index 17ca8153da..7d36fe2d63 100644 --- a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp +++ b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp @@ -1,5 +1,6 @@ #ifdef PA_DPP +#include #include #include #include "CommonFramework/GlobalSettingsPanel.h"