diff --git a/src/MeoAssistant/AbstractImageAnalyzer.h b/src/MeoAssistant/AbstractImageAnalyzer.h index 04e0684095..8557fbfc1c 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.h +++ b/src/MeoAssistant/AbstractImageAnalyzer.h @@ -3,10 +3,15 @@ #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 "AsstTypes.h" diff --git a/src/MeoAssistant/AbstractTask.cpp b/src/MeoAssistant/AbstractTask.cpp index 1b1bff4aea..8d73446841 100644 --- a/src/MeoAssistant/AbstractTask.cpp +++ b/src/MeoAssistant/AbstractTask.cpp @@ -8,10 +8,15 @@ #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 diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index 22144e0a4a..3d677b7aae 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -6,10 +6,15 @@ #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" diff --git a/src/MeoAssistant/AsstBattleDef.h b/src/MeoAssistant/AsstBattleDef.h index 1c4ce734a3..726c975afd 100644 --- a/src/MeoAssistant/AsstBattleDef.h +++ b/src/MeoAssistant/AsstBattleDef.h @@ -7,10 +7,15 @@ #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 "AsstTypes.h" diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index 9bab8e4c10..8ded4bcb41 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -3,10 +3,15 @@ #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 "AsstTypes.h" diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 5830718798..ced8ea9838 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -19,10 +19,15 @@ #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 #ifdef _MSC_VER diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index a05ba9ccde..f35d4d4414 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -18,10 +18,15 @@ #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 "AsstTypes.h" diff --git a/src/MeoAssistant/CreditShoppingTask.cpp b/src/MeoAssistant/CreditShoppingTask.cpp index 22f1868975..68eb53d02e 100644 --- a/src/MeoAssistant/CreditShoppingTask.cpp +++ b/src/MeoAssistant/CreditShoppingTask.cpp @@ -6,10 +6,15 @@ #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" diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index 7241bf85eb..3f179e7989 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -6,10 +6,15 @@ #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" diff --git a/src/MeoAssistant/TemplResource.h b/src/MeoAssistant/TemplResource.h index 4434735009..f572aa04cc 100644 --- a/src/MeoAssistant/TemplResource.h +++ b/src/MeoAssistant/TemplResource.h @@ -8,10 +8,15 @@ #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 namespace asst diff --git a/src/MeoAssistant/TilePack.cpp b/src/MeoAssistant/TilePack.cpp index daf73ba2ab..574bb19fd4 100644 --- a/src/MeoAssistant/TilePack.cpp +++ b/src/MeoAssistant/TilePack.cpp @@ -3,10 +3,15 @@ #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 "Logger.hpp" diff --git a/tools/ResourceUpdater/main.cpp b/tools/ResourceUpdater/main.cpp index 3ec6e47cfd..f37415efe9 100644 --- a/tools/ResourceUpdater/main.cpp +++ b/tools/ResourceUpdater/main.cpp @@ -5,10 +5,15 @@ #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