From 2f545acedb5bf4f76b0967e07e9e973a6dbd6eb8 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Mon, 1 Aug 2022 11:29:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=20c?= =?UTF-8?q?lang=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AbstractImageAnalyzer.h | 10 ++++++++-- src/MeoAssistant/AbstractTask.cpp | 10 ++++++++-- src/MeoAssistant/Assistant.cpp | 13 ------------- src/MeoAssistant/AsstBattleDef.h | 10 ++++++++-- src/MeoAssistant/AsstInfrastDef.h | 10 ++++++++-- src/MeoAssistant/Controller.cpp | 12 +++++++++--- src/MeoAssistant/Controller.h | 12 +++++++++--- src/MeoAssistant/CreditShoppingTask.cpp | 14 -------------- src/MeoAssistant/OcrPack.cpp | 10 ++++++++-- src/MeoAssistant/TemplResource.h | 10 ++++++++-- src/MeoAssistant/TilePack.cpp | 10 ++++++++-- tools/ResourceUpdater/main.cpp | 10 ++++++++-- 12 files changed, 82 insertions(+), 49 deletions(-) diff --git a/src/MeoAssistant/AbstractImageAnalyzer.h b/src/MeoAssistant/AbstractImageAnalyzer.h index 8557fbfc1c..9f0ade5505 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.h +++ b/src/MeoAssistant/AbstractImageAnalyzer.h @@ -3,14 +3,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/src/MeoAssistant/AbstractTask.cpp b/src/MeoAssistant/AbstractTask.cpp index 8d73446841..074541e820 100644 --- a/src/MeoAssistant/AbstractTask.cpp +++ b/src/MeoAssistant/AbstractTask.cpp @@ -8,14 +8,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif #include diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index 3d677b7aae..9ea50c78e3 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -3,19 +3,6 @@ #include #include -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#else -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" -#endif -#include -#ifdef _MSC_VER -#pragma warning( pop ) -#else -#pragma GCC diagnostic pop -#endif #include "AsstUtils.hpp" #include "Controller.h" diff --git a/src/MeoAssistant/AsstBattleDef.h b/src/MeoAssistant/AsstBattleDef.h index 726c975afd..58c3c1158b 100644 --- a/src/MeoAssistant/AsstBattleDef.h +++ b/src/MeoAssistant/AsstBattleDef.h @@ -7,14 +7,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index 8ded4bcb41..3a7ffe5187 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -3,14 +3,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index ced8ea9838..49e8011978 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -19,20 +19,26 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif #ifdef _MSC_VER #pragma warning( push ) -#pragma warning( disable : 4068) +#pragma warning( disable: 4068 ) #endif #include #ifdef _MSC_VER diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index f35d4d4414..6ba106cfc6 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -18,14 +18,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif -#include +#include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/src/MeoAssistant/CreditShoppingTask.cpp b/src/MeoAssistant/CreditShoppingTask.cpp index 68eb53d02e..7b410f1879 100644 --- a/src/MeoAssistant/CreditShoppingTask.cpp +++ b/src/MeoAssistant/CreditShoppingTask.cpp @@ -3,20 +3,6 @@ #include #include -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#else -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" -#endif -#include -#ifdef _MSC_VER -#pragma warning( pop ) -#else -#pragma GCC diagnostic pop -#endif - #include "Controller.h" #include "CreditShopImageAnalyzer.h" #include "MatchImageAnalyzer.h" diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index 3f179e7989..6cca9e1c07 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -6,14 +6,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/src/MeoAssistant/TemplResource.h b/src/MeoAssistant/TemplResource.h index f572aa04cc..f4c846c515 100644 --- a/src/MeoAssistant/TemplResource.h +++ b/src/MeoAssistant/TemplResource.h @@ -8,14 +8,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/src/MeoAssistant/TilePack.cpp b/src/MeoAssistant/TilePack.cpp index 574bb19fd4..17363c3da1 100644 --- a/src/MeoAssistant/TilePack.cpp +++ b/src/MeoAssistant/TilePack.cpp @@ -3,14 +3,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif diff --git a/tools/ResourceUpdater/main.cpp b/tools/ResourceUpdater/main.cpp index f37415efe9..4bf225f6f8 100644 --- a/tools/ResourceUpdater/main.cpp +++ b/tools/ResourceUpdater/main.cpp @@ -5,14 +5,20 @@ #ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable: 5054 ) -#else +#elif defined(__clang__) +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#pragma clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion" +#elif defined(__GNUC__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #include #ifdef _MSC_VER #pragma warning( pop ) -#else +#elif defined(__clang__) +#pragma clang diagnostic pop +#elif defined(__GNUC__) #pragma GCC diagnostic pop #endif #include