fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 尝试修复 clang warnings

Browse Source
This commit is contained in:
zzyyyl
2022-08-01 11:29:36 +08:00
parent d80f37f4a6
commit 2f545acedb
12 changed files with 82 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MeoAssistant/AbstractImageAnalyzer.h
View File

@@ -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 <opencv2/opencv.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

10
src/MeoAssistant/AbstractTask.cpp
View File

@@ -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 <opencv2/opencv.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#include <utility>

13
src/MeoAssistant/Assistant.cpp
View File

@@ -3,19 +3,6 @@
#include <ctime>
#include <meojson/json.hpp>
#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 <opencv2/opencv.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#pragma GCC diagnostic pop
#endif
#include "AsstUtils.hpp"
#include "Controller.h"

10
src/MeoAssistant/AsstBattleDef.h
View File

@@ -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 <opencv2/core/mat.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

10
src/MeoAssistant/AsstInfrastDef.h
View File

@@ -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 <opencv2/core/mat.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

12
src/MeoAssistant/Controller.cpp
View File

@@ -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 <opencv2/opencv.hpp>
#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 <zlib/decompress.hpp>
#ifdef _MSC_VER

12
src/MeoAssistant/Controller.h
View File

@@ -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 <opencv2/opencv.hpp>
#include <opencv2/core/mat.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

14
src/MeoAssistant/CreditShoppingTask.cpp
View File

@@ -3,20 +3,6 @@
#include <algorithm>
#include <vector>
#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 <opencv2/opencv.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#pragma GCC diagnostic pop
#endif
#include "Controller.h"
#include "CreditShopImageAnalyzer.h"
#include "MatchImageAnalyzer.h"

10
src/MeoAssistant/OcrPack.cpp
View File

@@ -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 <opencv2/opencv.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

10
src/MeoAssistant/TemplResource.h
View File

@@ -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 <opencv2/opencv.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

10
src/MeoAssistant/TilePack.cpp
View File

@@ -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 <Arknights-Tile-Pos/TileCalc.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

10
tools/ResourceUpdater/main.cpp
View File

@@ -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 <opencv2/opencv.hpp>
#ifdef _MSC_VER
#pragma warning( pop )
#else
#elif defined(__clang__)
#pragma clang diagnostic pop
#elif defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
#include <meojson/json.hpp>