Skip to content

Commit 9086b0f

Browse files
authored
Readd dpp warning silence (#613)
1 parent 725231f commit 9086b0f

File tree

7 files changed

+32
-0
lines changed

7 files changed

+32
-0
lines changed

3rdParty/dpp/DPP_SilenceWarnings.h

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/* Silence Warnings for DPP Headers
2+
*
3+
* From: https://github.com/PokemonAutomation/
4+
*
5+
* Include this before every DPP header to silence warnings in those headers.
6+
*
7+
*/
8+
9+
#ifndef PokemonAutomation_3rdParty_DPP_SilenceWarnings_H
10+
#define PokemonAutomation_3rdParty_DPP_SilenceWarnings_H
11+
12+
13+
#if 0
14+
#elif _MSC_VER
15+
16+
#pragma warning(disable:4100) // Unreferenced Formal Parameter
17+
#pragma warning(disable:4251) // dll-interface
18+
19+
#elif __GNUC__
20+
21+
#pragma GCC diagnostic ignored "-Wunused-parameter"
22+
23+
#endif
24+
25+
26+
#endif

SerialPrograms/Source/CommonFramework/Main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <QFileInfo>
55
//#include <QTextStream>
66
#include <QMessageBox>
7+
#include <dpp/DPP_SilenceWarnings.h>
78
#include <Integrations/DppIntegration/DppClient.h>
89
#include "Common/Cpp/Exceptions.h"
910
#include "Common/Cpp/ImageResolution.h"

SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66

77
#include <QFile>
8+
#include <dpp/DPP_SilenceWarnings.h>
89
#include <Integrations/DppIntegration/DppClient.h>
910
#include "Common/Cpp/PrettyPrint.h"
1011
#include "Common/Cpp/Json/JsonValue.h"

SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <QHBoxLayout>
88
#include <QLabel>
99
#include <QPushButton>
10+
#include <dpp/DPP_SilenceWarnings.h>
1011
#include "Common/Qt/StringToolsQt.h"
1112
//#include "CommonFramework/Globals.h"
1213
//#include "CommonFramework/GlobalSettingsPanel.h"

SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifdef PA_DPP
22

33
#include <set>
4+
#include <dpp/DPP_SilenceWarnings.h>
45
#include <dpp/dpp.h>
56
#include <Integrations/DppIntegration/DppClient.h>
67
#include <Integrations/DppIntegration/DppCommandHandler.h>

SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifdef PA_DPP
22

33
#include <format>
4+
#include <dpp/DPP_SilenceWarnings.h>
45
#include <dpp/dpp.h>
56
#include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
67
#include "CommonFramework/Globals.h"

SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#ifdef PA_DPP
22

3+
#include <dpp/DPP_SilenceWarnings.h>
34
#include <dpp/dpp.h>
45
#include <Integrations/DppIntegration/DppUtility.h>
56
#include "CommonFramework/GlobalSettingsPanel.h"

0 commit comments

Comments
 (0)