From 824b86107d6b7a833031d4faaaa016e41f30cd70 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Sun, 31 Jul 2022 15:10:51 +0800 Subject: [PATCH 01/11] =?UTF-8?q?refactor:=20=E5=8D=87=E7=BA=A7=20c++20!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AbstractImageAnalyzer.h | 7 +++++++ src/MeoAssistant/AbstractTask.cpp | 7 +++++++ src/MeoAssistant/Assistant.cpp | 7 +++++++ src/MeoAssistant/AsstBattleDef.h | 7 +++++++ src/MeoAssistant/AsstInfrastDef.h | 7 +++++++ src/MeoAssistant/Controller.cpp | 11 +++++++++++ src/MeoAssistant/Controller.h | 7 +++++++ src/MeoAssistant/CreditShoppingTask.cpp | 7 +++++++ src/MeoAssistant/MeoAssistant.vcxproj | 2 +- src/MeoAssistant/OcrPack.cpp | 7 +++++++ src/MeoAssistant/TemplResource.h | 7 +++++++ src/MeoAssistant/TilePack.cpp | 7 +++++++ tools/ResourceUpdater/main.cpp | 7 +++++++ 13 files changed, 89 insertions(+), 1 deletion(-) diff --git a/src/MeoAssistant/AbstractImageAnalyzer.h b/src/MeoAssistant/AbstractImageAnalyzer.h index 6cb1385bb0..04e0684095 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.h +++ b/src/MeoAssistant/AbstractImageAnalyzer.h @@ -1,6 +1,13 @@ #pragma once +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include "AsstTypes.h" diff --git a/src/MeoAssistant/AbstractTask.cpp b/src/MeoAssistant/AbstractTask.cpp index cb974cb997..1b1bff4aea 100644 --- a/src/MeoAssistant/AbstractTask.cpp +++ b/src/MeoAssistant/AbstractTask.cpp @@ -5,7 +5,14 @@ #include #include +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include #include "AsstUtils.hpp" diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index 34aa80b582..22144e0a4a 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -3,7 +3,14 @@ #include #include +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include "AsstUtils.hpp" #include "Controller.h" diff --git a/src/MeoAssistant/AsstBattleDef.h b/src/MeoAssistant/AsstBattleDef.h index 4d52c62d55..1c4ce734a3 100644 --- a/src/MeoAssistant/AsstBattleDef.h +++ b/src/MeoAssistant/AsstBattleDef.h @@ -4,7 +4,14 @@ #include #include +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include "AsstTypes.h" diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index 92641f7335..9bab8e4c10 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -1,6 +1,13 @@ #pragma once +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include "AsstTypes.h" diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index a81c69da4f..5830718798 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -16,12 +16,23 @@ #include #include +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif +#ifdef _MSC_VER #pragma warning( push ) #pragma warning( disable : 4068) +#endif #include +#ifdef _MSC_VER #pragma warning( pop ) +#endif #include "AsstTypes.h" #include "Logger.hpp" diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index ff5e64d644..a05ba9ccde 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -15,7 +15,14 @@ #include #endif +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include "AsstTypes.h" #include "AsstMsg.h" diff --git a/src/MeoAssistant/CreditShoppingTask.cpp b/src/MeoAssistant/CreditShoppingTask.cpp index 13f53e0e05..22f1868975 100644 --- a/src/MeoAssistant/CreditShoppingTask.cpp +++ b/src/MeoAssistant/CreditShoppingTask.cpp @@ -3,7 +3,14 @@ #include #include +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include "Controller.h" #include "CreditShopImageAnalyzer.h" diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index b7070f3fb9..97e8d9892d 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -264,7 +264,7 @@ true NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;%(PreprocessorDefinitions) true - stdcpp17 + stdcpp20 stdc11 MultiThreaded MaxSpeed diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index 5b31c2922a..7241bf85eb 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -3,7 +3,14 @@ #include #include +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include "AsstUtils.hpp" #include "Logger.hpp" diff --git a/src/MeoAssistant/TemplResource.h b/src/MeoAssistant/TemplResource.h index 3446ae7339..4434735009 100644 --- a/src/MeoAssistant/TemplResource.h +++ b/src/MeoAssistant/TemplResource.h @@ -5,7 +5,14 @@ #include #include +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif namespace asst { diff --git a/src/MeoAssistant/TilePack.cpp b/src/MeoAssistant/TilePack.cpp index 69d3dd0efa..daf73ba2ab 100644 --- a/src/MeoAssistant/TilePack.cpp +++ b/src/MeoAssistant/TilePack.cpp @@ -1,6 +1,13 @@ #include "TilePack.h" +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include "Logger.hpp" diff --git a/tools/ResourceUpdater/main.cpp b/tools/ResourceUpdater/main.cpp index 710bd51a06..3ec6e47cfd 100644 --- a/tools/ResourceUpdater/main.cpp +++ b/tools/ResourceUpdater/main.cpp @@ -2,7 +2,14 @@ #include #include +#ifdef _MSC_VER +#pragma warning( push ) +#pragma warning( disable: 5054 ) +#endif #include +#ifdef _MSC_VER +#pragma warning( pop ) +#endif #include bool update_items_data(const std::filesystem::path& input_dir, const std::filesystem::path& output_dir); From 26c66992e9bf82ac227903425cf256a3dc97bfa0 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Sun, 31 Jul 2022 19:22:23 +0800 Subject: [PATCH 02/11] =?UTF-8?q?docs:=20=E6=8A=8A=20README=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20badge=20=E4=BB=8E=20c++17=20=E6=94=B9=E4=B8=BA=20c+?= =?UTF-8?q?+20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- README_en-US.md | 2 +- README_ja-JP.md | 2 +- README_zh-TW.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5f65edb574..625b4e44f7 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@
- C++ + C++
platform diff --git a/README_en-US.md b/README_en-US.md index 6b831fa502..17ecbf9908 100644 --- a/README_en-US.md +++ b/README_en-US.md @@ -6,7 +6,7 @@
- C++ + C++
platform diff --git a/README_ja-JP.md b/README_ja-JP.md index e66f64d147..ace4db1222 100644 --- a/README_ja-JP.md +++ b/README_ja-JP.md @@ -6,7 +6,7 @@
- C++ + C++
platform diff --git a/README_zh-TW.md b/README_zh-TW.md index 6b6f572b10..ee0b838e3b 100644 --- a/README_zh-TW.md +++ b/README_zh-TW.md @@ -6,7 +6,7 @@
- C++ + C++
platform From 5bca34ae4960523844d89b9d58f2c463ed7d0dac Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Sun, 31 Jul 2022 19:27:55 +0800 Subject: [PATCH 03/11] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=20CMakeLists?= =?UTF-8?q?=20=E7=9A=84=20C++=20=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e37451fd6..79fb1fb8fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(MaaAssistantArknights) option(BUILD_JNI "build jni" OFF) option(BUILD_TEST "build a demo" OFF) -set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD 20) if (WIN32) add_compile_options("$<$:/utf-8>") From 52c25d56cc089308c0b0ad349b67e6eb61f34923 Mon Sep 17 00:00:00 2001 From: Horror Proton <107091537+horror-proton@users.noreply.github.com> Date: Sun, 31 Jul 2022 21:39:16 +0800 Subject: [PATCH 04/11] fix: suppress `-Wdeprecated-enum-enum-conversion` in opencv --- src/MeoAssistant/AbstractImageAnalyzer.h | 5 +++++ src/MeoAssistant/AbstractTask.cpp | 5 +++++ src/MeoAssistant/Assistant.cpp | 5 +++++ src/MeoAssistant/AsstBattleDef.h | 5 +++++ src/MeoAssistant/AsstInfrastDef.h | 5 +++++ src/MeoAssistant/Controller.cpp | 5 +++++ src/MeoAssistant/Controller.h | 5 +++++ src/MeoAssistant/CreditShoppingTask.cpp | 5 +++++ src/MeoAssistant/OcrPack.cpp | 5 +++++ src/MeoAssistant/TemplResource.h | 5 +++++ src/MeoAssistant/TilePack.cpp | 5 +++++ tools/ResourceUpdater/main.cpp | 5 +++++ 12 files changed, 60 insertions(+) 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 From 2b09e83104ac7775e8e24d806b02e05d801077e1 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Sun, 31 Jul 2022 21:56:21 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20linux=20?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E4=B8=80=E4=BA=9B=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AsstTypes.h | 4 ++-- src/MeoAssistant/MultiMatchImageAnalyzer.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MeoAssistant/AsstTypes.h b/src/MeoAssistant/AsstTypes.h index 86d3059d2f..34f45534d3 100644 --- a/src/MeoAssistant/AsstTypes.h +++ b/src/MeoAssistant/AsstTypes.h @@ -139,7 +139,7 @@ friend Point& operator Op##= (Point& val, const Point& opd) noexcept { val.x Op# ~TextRect() = default; TextRect(const TextRect&) = default; TextRect(TextRect&&) noexcept = default; - explicit TextRect(double score, const Rect& rect, const std::string& text) + TextRect(double score, const Rect& rect, const std::string& text) : score(score), rect(rect), text(text) {} @@ -181,7 +181,7 @@ friend Point& operator Op##= (Point& val, const Point& opd) noexcept { val.x Op# ~MatchRect() = default; MatchRect(const MatchRect&) = default; MatchRect(MatchRect&&) noexcept = default; - explicit MatchRect(double score, const Rect& rect) + MatchRect(double score, const Rect& rect) : score(score), rect(rect) {} diff --git a/src/MeoAssistant/MultiMatchImageAnalyzer.cpp b/src/MeoAssistant/MultiMatchImageAnalyzer.cpp index 7935ec6fb8..83ad866d42 100644 --- a/src/MeoAssistant/MultiMatchImageAnalyzer.cpp +++ b/src/MeoAssistant/MultiMatchImageAnalyzer.cpp @@ -140,7 +140,7 @@ bool asst::MultiMatchImageAnalyzer::multi_match_templ(const cv::Mat templ) } } if (need_push) { - m_result.emplace_back(MatchRect{ value, rect }); + m_result.emplace_back(value, rect); } } } From 85293bb278184a7462199a615b1cc7f1b1853492 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Mon, 1 Aug 2022 11:29:36 +0800 Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=20clang=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 From ff400fd143d8e2454cf0ba3781ff72ce8bcb2b11 Mon Sep 17 00:00:00 2001 From: Horror Proton <107091537+horror-proton@users.noreply.github.com> Date: Mon, 1 Aug 2022 12:12:30 +0800 Subject: [PATCH 07/11] feat: add Config.hpp --- src/MeoAssistant/AbstractImageAnalyzer.h | 21 +++------------ src/MeoAssistant/AbstractTask.cpp | 21 +++------------ src/MeoAssistant/AsstBattleDef.h | 21 +++------------ src/MeoAssistant/AsstInfrastDef.h | 22 +++------------- src/MeoAssistant/Config.hpp | 33 ++++++++++++++++++++++++ src/MeoAssistant/Controller.cpp | 21 +++------------ src/MeoAssistant/Controller.h | 22 +++------------- src/MeoAssistant/OcrPack.cpp | 21 +++------------ src/MeoAssistant/TemplResource.h | 21 +++------------ src/MeoAssistant/TilePack.cpp | 21 +++------------ 10 files changed, 62 insertions(+), 162 deletions(-) create mode 100644 src/MeoAssistant/Config.hpp diff --git a/src/MeoAssistant/AbstractImageAnalyzer.h b/src/MeoAssistant/AbstractImageAnalyzer.h index 9f0ade5505..090976b078 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.h +++ b/src/MeoAssistant/AbstractImageAnalyzer.h @@ -1,24 +1,9 @@ #pragma once -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END #include "AsstTypes.h" diff --git a/src/MeoAssistant/AbstractTask.cpp b/src/MeoAssistant/AbstractTask.cpp index 074541e820..5c11b6af33 100644 --- a/src/MeoAssistant/AbstractTask.cpp +++ b/src/MeoAssistant/AbstractTask.cpp @@ -5,25 +5,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END #include #include "AsstUtils.hpp" diff --git a/src/MeoAssistant/AsstBattleDef.h b/src/MeoAssistant/AsstBattleDef.h index 58c3c1158b..2ccad739d7 100644 --- a/src/MeoAssistant/AsstBattleDef.h +++ b/src/MeoAssistant/AsstBattleDef.h @@ -4,25 +4,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END #include "AsstTypes.h" diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index 3a7ffe5187..cd3a106ba7 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -1,24 +1,10 @@ #pragma once -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END + #include "AsstTypes.h" diff --git a/src/MeoAssistant/Config.hpp b/src/MeoAssistant/Config.hpp new file mode 100644 index 0000000000..f7822435ba --- /dev/null +++ b/src/MeoAssistant/Config.hpp @@ -0,0 +1,33 @@ +#pragma once + +#ifdef _MSC_VER +#define ASST_DO_PRAGMA(x) __pragma(x) +#elif defined(__GNUC__) +#define ASST_DO_PRAGMA(x) _Pragma(#x) +#else +#define ASST_DO_PRAGMA(x) +#endif + +#ifdef _MSC_VER +#define ASST_SUPPRESS_CV_WARNINGS_START \ +ASST_DO_PRAGMA(warning(push)) \ +ASST_DO_PRAGMA(warning(disable: 5054)) +#define ASST_SUPPRESS_CV_WARNINGS_END \ +ASST_DO_PRAGMA(warning(pop)) +#elif defined(__clang__) +#define ASST_SUPPRESS_CV_WARNINGS_START \ +ASST_DO_PRAGMA(clang diagnostic push) \ +ASST_DO_PRAGMA(clang diagnostic ignored "-Wdeprecated-enum-enum-conversion") \ +ASST_DO_PRAGMA(clang diagnostic ignored "-Wdeprecated-anon-enum-enum-conversion") +#define ASST_SUPPRESS_CV_WARNINGS_END \ +ASST_DO_PRAGMA(clang diagnostic pop) +#elif defined(__GNUC__) +#define ASST_SUPPRESS_CV_WARNINGS_START \ +ASST_DO_PRAGMA(GCC diagnostic push) \ +ASST_DO_PRAGMA(GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion") +#define ASST_SUPPRESS_CV_WARNINGS_END \ +ASST_DO_PRAGMA(GCC diagnostic pop) +#else +#define ASST_SUPPRESS_CV_WARNINGS_START +#define ASST_SUPPRESS_CV_WARNINGS_END +#endif diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 49e8011978..9987408b7a 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -16,25 +16,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END #ifdef _MSC_VER #pragma warning( push ) diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index 6ba106cfc6..0a476ddf13 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -15,25 +15,11 @@ #include #endif -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END + #include "AsstTypes.h" #include "AsstMsg.h" diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index 6cca9e1c07..57d5a24213 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -3,25 +3,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END #include "AsstUtils.hpp" #include "Logger.hpp" diff --git a/src/MeoAssistant/TemplResource.h b/src/MeoAssistant/TemplResource.h index f4c846c515..57907457ab 100644 --- a/src/MeoAssistant/TemplResource.h +++ b/src/MeoAssistant/TemplResource.h @@ -5,25 +5,10 @@ #include #include -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END namespace asst { diff --git a/src/MeoAssistant/TilePack.cpp b/src/MeoAssistant/TilePack.cpp index 17363c3da1..95037b598d 100644 --- a/src/MeoAssistant/TilePack.cpp +++ b/src/MeoAssistant/TilePack.cpp @@ -1,24 +1,9 @@ #include "TilePack.h" -#ifdef _MSC_VER -#pragma warning( push ) -#pragma warning( disable: 5054 ) -#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 "Config.hpp" +ASST_SUPPRESS_CV_WARNINGS_START #include -#ifdef _MSC_VER -#pragma warning( pop ) -#elif defined(__clang__) -#pragma clang diagnostic pop -#elif defined(__GNUC__) -#pragma GCC diagnostic pop -#endif +ASST_SUPPRESS_CV_WARNINGS_END #include "Logger.hpp" From 87ad357322e4c7dce156cf78a115a8c41988fd17 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Mon, 1 Aug 2022 12:39:40 +0800 Subject: [PATCH 08/11] =?UTF-8?q?style:=20=E5=88=A0=E6=8E=89=E5=A4=9A?= =?UTF-8?q?=E7=9A=84=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AsstInfrastDef.h | 1 - src/MeoAssistant/Controller.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index cd3a106ba7..94d1fcc8c5 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -5,7 +5,6 @@ ASST_SUPPRESS_CV_WARNINGS_START #include ASST_SUPPRESS_CV_WARNINGS_END - #include "AsstTypes.h" namespace asst::infrast diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index 0a476ddf13..445317a7fa 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -20,7 +20,6 @@ ASST_SUPPRESS_CV_WARNINGS_START #include ASST_SUPPRESS_CV_WARNINGS_END - #include "AsstTypes.h" #include "AsstMsg.h" From cdba6067e09fef8d11cf67c92d101502a0624e74 Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Mon, 1 Aug 2022 12:45:13 +0800 Subject: [PATCH 09/11] =?UTF-8?q?chore:=20=E6=8A=8A=20Config.hpp=20?= =?UTF-8?q?=E6=94=BE=E5=88=B0=20filter=20=E7=9A=84=20Utils=20=E9=87=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/MeoAssistant.vcxproj | 1 + src/MeoAssistant/MeoAssistant.vcxproj.filters | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index 97e8d9892d..a22d9b8f77 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -31,6 +31,7 @@ + diff --git a/src/MeoAssistant/MeoAssistant.vcxproj.filters b/src/MeoAssistant/MeoAssistant.vcxproj.filters index aff2f6e5a3..392fc9ec49 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj.filters +++ b/src/MeoAssistant/MeoAssistant.vcxproj.filters @@ -366,6 +366,9 @@ 头文件\Task\Plugin\Roguelike + + 头文件\Utils + From a9ffc18c094555af3939b7aa39d56fee5246e570 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 1 Aug 2022 20:16:58 +0800 Subject: [PATCH 10/11] =?UTF-8?q?refactor:=20=E5=B0=86=20disable=20cv=20wa?= =?UTF-8?q?rning=20=E7=9A=84=E5=AE=8F=E9=A2=9D=E5=A4=96=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E4=BA=86=E4=B8=80=E5=B1=82=E5=A4=B4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AbstractImageAnalyzer.cpp | 2 + src/MeoAssistant/AbstractImageAnalyzer.h | 6 +- src/MeoAssistant/AbstractTask.cpp | 7 +- src/MeoAssistant/AsstBattleDef.h | 5 +- src/MeoAssistant/{Config.hpp => AsstConf.h} | 0 src/MeoAssistant/AsstInfrastDef.h | 5 +- src/MeoAssistant/BattleImageAnalyzer.cpp | 2 + src/MeoAssistant/BattleProcessTask.cpp | 74 ++++++++++--------- src/MeoAssistant/Controller.cpp | 5 +- src/MeoAssistant/Controller.h | 5 +- src/MeoAssistant/CreditShopImageAnalyzer.cpp | 3 +- src/MeoAssistant/DebugTask.cpp | 2 + src/MeoAssistant/DepotImageAnalyzer.cpp | 2 + src/MeoAssistant/HashImageAnalyzer.cpp | 2 + .../InfrastClueVacancyImageAnalyzer.cpp | 2 + .../InfrastFacilityImageAnalyzer.cpp | 2 + src/MeoAssistant/InfrastOperImageAnalyzer.cpp | 2 + .../InfrastSmileyImageAnalyzer.cpp | 2 + src/MeoAssistant/MatchImageAnalyzer.cpp | 2 + src/MeoAssistant/MeoAssistant.vcxproj | 4 +- src/MeoAssistant/MeoAssistant.vcxproj.filters | 8 +- src/MeoAssistant/MultiMatchImageAnalyzer.cpp | 2 + src/MeoAssistant/NoWarningCV.h | 7 ++ src/MeoAssistant/NoWarningCVMat.h | 7 ++ src/MeoAssistant/OcrPack.cpp | 5 +- .../OcrWithPreprocessImageAnalyzer.cpp | 2 + .../RoguelikeBattleTaskPlugin.cpp | 2 + src/MeoAssistant/RoguelikeBattleTaskPlugin.h | 2 + .../RoguelikeFormationImageAnalyzer.cpp | 2 + .../RoguelikeSkillSelectionImageAnalyzer.cpp | 2 + src/MeoAssistant/StageDropsImageAnalyzer.cpp | 2 + src/MeoAssistant/TemplResource.cpp | 2 + src/MeoAssistant/TemplResource.h | 5 +- src/MeoAssistant/TilePack.cpp | 2 +- 34 files changed, 113 insertions(+), 71 deletions(-) rename src/MeoAssistant/{Config.hpp => AsstConf.h} (100%) create mode 100644 src/MeoAssistant/NoWarningCV.h create mode 100644 src/MeoAssistant/NoWarningCVMat.h diff --git a/src/MeoAssistant/AbstractImageAnalyzer.cpp b/src/MeoAssistant/AbstractImageAnalyzer.cpp index 06bd686dbd..7b38d5924e 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.cpp +++ b/src/MeoAssistant/AbstractImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "AbstractImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Controller.h" #include "Logger.hpp" diff --git a/src/MeoAssistant/AbstractImageAnalyzer.h b/src/MeoAssistant/AbstractImageAnalyzer.h index 090976b078..289b4cfe98 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.h +++ b/src/MeoAssistant/AbstractImageAnalyzer.h @@ -1,10 +1,6 @@ #pragma once -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END - +#include "NoWarningCVMat.h" #include "AsstTypes.h" //#ifndef ASST_DEBUG diff --git a/src/MeoAssistant/AbstractTask.cpp b/src/MeoAssistant/AbstractTask.cpp index 5c11b6af33..e184314fbf 100644 --- a/src/MeoAssistant/AbstractTask.cpp +++ b/src/MeoAssistant/AbstractTask.cpp @@ -4,13 +4,10 @@ #include #include #include - -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END #include +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Controller.h" #include "Logger.hpp" diff --git a/src/MeoAssistant/AsstBattleDef.h b/src/MeoAssistant/AsstBattleDef.h index 2ccad739d7..fa8a0ff4d2 100644 --- a/src/MeoAssistant/AsstBattleDef.h +++ b/src/MeoAssistant/AsstBattleDef.h @@ -4,10 +4,7 @@ #include #include -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCVMat.h" #include "AsstTypes.h" diff --git a/src/MeoAssistant/Config.hpp b/src/MeoAssistant/AsstConf.h similarity index 100% rename from src/MeoAssistant/Config.hpp rename to src/MeoAssistant/AsstConf.h diff --git a/src/MeoAssistant/AsstInfrastDef.h b/src/MeoAssistant/AsstInfrastDef.h index 94d1fcc8c5..00d7051966 100644 --- a/src/MeoAssistant/AsstInfrastDef.h +++ b/src/MeoAssistant/AsstInfrastDef.h @@ -1,9 +1,6 @@ #pragma once -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCVMat.h" #include "AsstTypes.h" diff --git a/src/MeoAssistant/BattleImageAnalyzer.cpp b/src/MeoAssistant/BattleImageAnalyzer.cpp index f9829c14f7..03742c4f08 100644 --- a/src/MeoAssistant/BattleImageAnalyzer.cpp +++ b/src/MeoAssistant/BattleImageAnalyzer.cpp @@ -2,6 +2,8 @@ #include +#include "NoWarningCV.h" + #include "MultiMatchImageAnalyzer.h" #include "MatchImageAnalyzer.h" #include "OcrWithFlagTemplImageAnalyzer.h" diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp index c437b32814..72a3859a23 100644 --- a/src/MeoAssistant/BattleProcessTask.cpp +++ b/src/MeoAssistant/BattleProcessTask.cpp @@ -4,6 +4,8 @@ #include #include +#include "NoWarningCV.h" + #include "Controller.h" #include "Resource.h" #include "TaskData.h" @@ -480,7 +482,7 @@ bool asst::BattleProcessTask::oper_deploy(const BattleAction& action) Rect placed_rect{ placed_point.x ,placed_point.y, 0, 0 }; int dist = static_cast(Point::distance( - placed_point, {oper_rect.x + oper_rect.width / 2, oper_rect.y + oper_rect.height / 2})); + placed_point, { oper_rect.x + oper_rect.width / 2, oper_rect.y + oper_rect.height / 2 })); // 1000 是随便取的一个系数，把整数的 pre_delay 转成小数用的 int duration = static_cast(swipe_oper_task_ptr->pre_delay / 1000.0 * dist * log10(dist)); m_ctrler->swipe(oper_rect, placed_rect, duration, true, 0); @@ -637,12 +639,12 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( { /* * * dlx 算法简介 - * + * * https://oi-wiki.org/search/dlx/ * - * + * * * dlx 算法作用 - * + * * 在形如: * a: 10010 * b: 01110 @@ -659,33 +661,33 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( * * * * dlx 算法建模 - * + * * dlx 的列分为 [组号] [干员号] 两部分 * dlx 的行分为 [可能的选择对] [不选择该干员] 两部分 - * + * * [可能的选择对]: * 每行对应一种可能的选择, * 将组号，干员号对应位置的列设为1 - * + * * [不选择该干员]: * 每行对应不选择某干员的情况, * 将干员号对应位置的列设为1 * * * * dlx 建模示例 - * + * * 有以下分组: * a: {1, 3, 4} * b: {2, 3, 5} * c: {1, 2, 3} * 拥有的干员: * {1, 2, 4, 5, 6} - * + * * 先处理出所有可能的情况: * a: {1, 4} * b: {2, 5} * c: {1, 2} - * + * * 构造表: * abc 1245 * 1 100 1000 @@ -698,20 +700,20 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( * 9 000 0100 ~2 * 9 000 0010 ~4 * A 000 0001 ~5 - * + * * 使用dlx求得一组解: * 一个可能的结果是: * 行号 {2, 3, 5, A} * 即 {, , , ~5} - * + * * 输出分组结果: * a: 4 * b: 2 * c: 1 - * + * */ - // dlx 算法模板类 + // dlx 算法模板类 class DancingLinksModel { private: @@ -721,7 +723,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( std::vector left, right, up, down; std::vector column, row; - void remove(const size_t &column_id) { + void remove(const size_t& column_id) + { left[right[column_id]] = left[column_id]; right[left[column_id]] = right[column_id]; for (size_t i = down[column_id]; i != column_id; i = down[i]) { @@ -733,7 +736,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( } } - void recover(const size_t &column_id) { + void recover(const size_t& column_id) + { for (size_t i = up[column_id]; i != column_id; i = up[i]) { for (size_t j = left[i]; j != i; j = left[j]) { up[down[j]] = down[up[j]] = j; @@ -748,19 +752,20 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( size_t answer_stack_size{}; std::vector answer_stack; - DancingLinksModel(const size_t &max_node_num, const size_t &max_ans_size) : - first(max_node_num), - size(max_node_num), - left(max_node_num), - right(max_node_num), - up(max_node_num), - down(max_node_num), - column(max_node_num), - row(max_node_num), - answer_stack(max_ans_size) { - } + DancingLinksModel(const size_t& max_node_num, const size_t& max_ans_size) : + first(max_node_num), + size(max_node_num), + left(max_node_num), + right(max_node_num), + up(max_node_num), + down(max_node_num), + column(max_node_num), + row(max_node_num), + answer_stack(max_ans_size) + {} - void build(const size_t &column_id) { + void build(const size_t& column_id) + { for (size_t i = 0; i <= column_id; i++) { left[i] = i - 1; right[i] = i + 1; @@ -773,7 +778,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( size.clear(); } - void insert(const size_t &row_id, const size_t &column_id) { + void insert(const size_t& row_id, const size_t& column_id) + { column[++index] = column_id; row[index] = row_id; ++size[column_id]; @@ -783,7 +789,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( down[column_id] = index; if (!first[row_id]) { first[row_id] = left[index] = right[index] = index; - } else { + } + else { right[index] = right[first[row_id]]; left[right[first[row_id]]] = index; left[index] = first[row_id]; @@ -791,7 +798,8 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( } } - bool dance(const size_t &depth) { + bool dance(const size_t& depth) + { if (!right[0]) { answer_stack_size = depth; return true; @@ -828,10 +836,10 @@ asst::BattleProcessTask::get_char_allocation_for_each_group( std::unordered_map char_name_mapping; std::set char_set(char_list.begin(), char_list.end()); - for (auto &i: group_list) { + for (auto& i : group_list) { group_name_mapping[i.first] = group_id_mapping.size(); group_id_mapping.emplace_back(i.first); - for (auto &j: i.second) { + for (auto& j : i.second) { if (char_set.contains(j)) { node_id_mapping.emplace_back(i.first, j); if (!char_name_mapping.contains(j)) { diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 9987408b7a..aa1c488bc3 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -16,10 +16,7 @@ #include #include -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCV.h" #ifdef _MSC_VER #pragma warning( push ) diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index 445317a7fa..4dac827047 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -15,10 +15,7 @@ #include #endif -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCVMat.h" #include "AsstTypes.h" #include "AsstMsg.h" diff --git a/src/MeoAssistant/CreditShopImageAnalyzer.cpp b/src/MeoAssistant/CreditShopImageAnalyzer.cpp index bf952bfa26..124a632436 100644 --- a/src/MeoAssistant/CreditShopImageAnalyzer.cpp +++ b/src/MeoAssistant/CreditShopImageAnalyzer.cpp @@ -1,10 +1,11 @@ #include "CreditShopImageAnalyzer.h" +#include "NoWarningCV.h" + #include "MatchImageAnalyzer.h" #include "MultiMatchImageAnalyzer.h" #include "OcrImageAnalyzer.h" #include "Resource.h" - #include "AsstUtils.hpp" void asst::CreditShopImageAnalyzer::set_black_list(std::vector black_list) diff --git a/src/MeoAssistant/DebugTask.cpp b/src/MeoAssistant/DebugTask.cpp index 2b10b2911f..a66ba6de39 100644 --- a/src/MeoAssistant/DebugTask.cpp +++ b/src/MeoAssistant/DebugTask.cpp @@ -2,6 +2,8 @@ #include +#include "NoWarningCV.h" + //#include "RoguelikeSkillSelectionTaskPlugin.h" #include "StageDropsImageAnalyzer.h" diff --git a/src/MeoAssistant/DepotImageAnalyzer.cpp b/src/MeoAssistant/DepotImageAnalyzer.cpp index 6f6788eff9..21a83c308d 100644 --- a/src/MeoAssistant/DepotImageAnalyzer.cpp +++ b/src/MeoAssistant/DepotImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "DepotImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" #include "TaskData.h" diff --git a/src/MeoAssistant/HashImageAnalyzer.cpp b/src/MeoAssistant/HashImageAnalyzer.cpp index ed6318df5c..64f3c2eb59 100644 --- a/src/MeoAssistant/HashImageAnalyzer.cpp +++ b/src/MeoAssistant/HashImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "HashImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" diff --git a/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.cpp b/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.cpp index f3a96e182d..b7a365d483 100644 --- a/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.cpp +++ b/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "InfrastClueVacancyImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" #include "MatchImageAnalyzer.h" diff --git a/src/MeoAssistant/InfrastFacilityImageAnalyzer.cpp b/src/MeoAssistant/InfrastFacilityImageAnalyzer.cpp index fa90f6d881..4e9c789853 100644 --- a/src/MeoAssistant/InfrastFacilityImageAnalyzer.cpp +++ b/src/MeoAssistant/InfrastFacilityImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "InfrastFacilityImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" #include "MultiMatchImageAnalyzer.h" diff --git a/src/MeoAssistant/InfrastOperImageAnalyzer.cpp b/src/MeoAssistant/InfrastOperImageAnalyzer.cpp index 084517867f..7edd306a93 100644 --- a/src/MeoAssistant/InfrastOperImageAnalyzer.cpp +++ b/src/MeoAssistant/InfrastOperImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "InfrastOperImageAnalyzer.h" +#include "NoWarningCV.h" + #include "InfrastSmileyImageAnalyzer.h" #include "MatchImageAnalyzer.h" #include "HashImageAnalyzer.h" diff --git a/src/MeoAssistant/InfrastSmileyImageAnalyzer.cpp b/src/MeoAssistant/InfrastSmileyImageAnalyzer.cpp index 4a15e873ef..64aa68f4fc 100644 --- a/src/MeoAssistant/InfrastSmileyImageAnalyzer.cpp +++ b/src/MeoAssistant/InfrastSmileyImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "InfrastSmileyImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "MultiMatchImageAnalyzer.h" #include "Resource.h" diff --git a/src/MeoAssistant/MatchImageAnalyzer.cpp b/src/MeoAssistant/MatchImageAnalyzer.cpp index 0732ae140c..f6fb15341d 100644 --- a/src/MeoAssistant/MatchImageAnalyzer.cpp +++ b/src/MeoAssistant/MatchImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "MatchImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "Logger.hpp" #include "Resource.h" diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index a22d9b8f77..2a2a98d1c5 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -31,7 +31,7 @@ - + @@ -40,6 +40,8 @@ + + diff --git a/src/MeoAssistant/MeoAssistant.vcxproj.filters b/src/MeoAssistant/MeoAssistant.vcxproj.filters index 392fc9ec49..f8a211d494 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj.filters +++ b/src/MeoAssistant/MeoAssistant.vcxproj.filters @@ -366,7 +366,13 @@ 头文件\Task\Plugin\Roguelike - + + 头文件\Utils + + + 头文件\Utils + + 头文件\Utils diff --git a/src/MeoAssistant/MultiMatchImageAnalyzer.cpp b/src/MeoAssistant/MultiMatchImageAnalyzer.cpp index 83ad866d42..b5ef709534 100644 --- a/src/MeoAssistant/MultiMatchImageAnalyzer.cpp +++ b/src/MeoAssistant/MultiMatchImageAnalyzer.cpp @@ -2,6 +2,8 @@ #include +#include "NoWarningCV.h" + #include "Logger.hpp" #include "Resource.h" #include "TaskData.h" diff --git a/src/MeoAssistant/NoWarningCV.h b/src/MeoAssistant/NoWarningCV.h new file mode 100644 index 0000000000..61c79c08e7 --- /dev/null +++ b/src/MeoAssistant/NoWarningCV.h @@ -0,0 +1,7 @@ +#pragma once + +#include "AsstConf.h" + +ASST_SUPPRESS_CV_WARNINGS_START +#include +ASST_SUPPRESS_CV_WARNINGS_END diff --git a/src/MeoAssistant/NoWarningCVMat.h b/src/MeoAssistant/NoWarningCVMat.h new file mode 100644 index 0000000000..d825243ec2 --- /dev/null +++ b/src/MeoAssistant/NoWarningCVMat.h @@ -0,0 +1,7 @@ +#pragma once + +#include "AsstConf.h" + +ASST_SUPPRESS_CV_WARNINGS_START +#include +ASST_SUPPRESS_CV_WARNINGS_END diff --git a/src/MeoAssistant/OcrPack.cpp b/src/MeoAssistant/OcrPack.cpp index 57d5a24213..e5b23cbdbd 100644 --- a/src/MeoAssistant/OcrPack.cpp +++ b/src/MeoAssistant/OcrPack.cpp @@ -2,11 +2,8 @@ #include +#include "NoWarningCV.h" #include -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END #include "AsstUtils.hpp" #include "Logger.hpp" diff --git a/src/MeoAssistant/OcrWithPreprocessImageAnalyzer.cpp b/src/MeoAssistant/OcrWithPreprocessImageAnalyzer.cpp index 6ab312ecf3..1dea221458 100644 --- a/src/MeoAssistant/OcrWithPreprocessImageAnalyzer.cpp +++ b/src/MeoAssistant/OcrWithPreprocessImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "OcrWithPreprocessImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" bool asst::OcrWithPreprocessImageAnalyzer::analyze() diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp index 4292c8a8f8..2ea9afcf62 100644 --- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp +++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.cpp @@ -3,6 +3,8 @@ #include #include +#include "NoWarningCV.h" + #include "BattleImageAnalyzer.h" #include "Controller.h" #include "TaskData.h" diff --git a/src/MeoAssistant/RoguelikeBattleTaskPlugin.h b/src/MeoAssistant/RoguelikeBattleTaskPlugin.h index 0d4a52c09a..64756ee34e 100644 --- a/src/MeoAssistant/RoguelikeBattleTaskPlugin.h +++ b/src/MeoAssistant/RoguelikeBattleTaskPlugin.h @@ -1,5 +1,7 @@ #pragma once +#include + #include "AbstractTaskPlugin.h" #include "AsstTypes.h" #include "TilePack.h" diff --git a/src/MeoAssistant/RoguelikeFormationImageAnalyzer.cpp b/src/MeoAssistant/RoguelikeFormationImageAnalyzer.cpp index 98afc5a78f..6483a8f5b5 100644 --- a/src/MeoAssistant/RoguelikeFormationImageAnalyzer.cpp +++ b/src/MeoAssistant/RoguelikeFormationImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "RoguelikeFormationImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "MultiMatchImageAnalyzer.h" #include "TaskData.h" diff --git a/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp index e83ea309c7..04b0ffd0d1 100644 --- a/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp +++ b/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "RoguelikeSkillSelectionImageAnalyzer.h" +#include "NoWarningCV.h" + #include "AsstUtils.hpp" #include "OcrWithPreprocessImageAnalyzer.h" #include "MultiMatchImageAnalyzer.h" diff --git a/src/MeoAssistant/StageDropsImageAnalyzer.cpp b/src/MeoAssistant/StageDropsImageAnalyzer.cpp index 0a1fa12677..ec2f33f644 100644 --- a/src/MeoAssistant/StageDropsImageAnalyzer.cpp +++ b/src/MeoAssistant/StageDropsImageAnalyzer.cpp @@ -1,5 +1,7 @@ #include "StageDropsImageAnalyzer.h" +#include "NoWarningCV.h" + #include "TaskData.h" #include "OcrWithPreprocessImageAnalyzer.h" #include "MatchImageAnalyzer.h" diff --git a/src/MeoAssistant/TemplResource.cpp b/src/MeoAssistant/TemplResource.cpp index 735367eb61..2f7132117e 100644 --- a/src/MeoAssistant/TemplResource.cpp +++ b/src/MeoAssistant/TemplResource.cpp @@ -4,6 +4,8 @@ #include #include +#include "NoWarningCV.h" + #include "Logger.hpp" void asst::TemplResource::set_load_required(std::unordered_set required) noexcept diff --git a/src/MeoAssistant/TemplResource.h b/src/MeoAssistant/TemplResource.h index 57907457ab..8a65bfe762 100644 --- a/src/MeoAssistant/TemplResource.h +++ b/src/MeoAssistant/TemplResource.h @@ -5,10 +5,7 @@ #include #include -#include "Config.hpp" -ASST_SUPPRESS_CV_WARNINGS_START -#include -ASST_SUPPRESS_CV_WARNINGS_END +#include "NoWarningCVMat.h" namespace asst { diff --git a/src/MeoAssistant/TilePack.cpp b/src/MeoAssistant/TilePack.cpp index 95037b598d..5f9fb2bfc4 100644 --- a/src/MeoAssistant/TilePack.cpp +++ b/src/MeoAssistant/TilePack.cpp @@ -1,6 +1,6 @@ #include "TilePack.h" -#include "Config.hpp" +#include "AsstConf.h" ASST_SUPPRESS_CV_WARNINGS_START #include ASST_SUPPRESS_CV_WARNINGS_END From 683f626ba5d6419f7adae197a21e737dada94019 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 1 Aug 2022 20:25:18 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DDeb=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=EF=BC=88C++20?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/MeoAssistant.vcxproj | 9 +-------- tools/ResourceUpdater/ResourceUpdater.vcxproj | 2 +- tools/TestCaller/TestCaller.vcxproj | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index 2a2a98d1c5..881b969627 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -1,10 +1,6 @@ - - Debug - x64 - Release x64 @@ -232,9 +228,6 @@ true Unicode - - v143 - @@ -317,7 +310,7 @@ true NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;ASST_DEBUG;%(PreprocessorDefinitions) true - stdcpp17 + stdcpp20 stdc11 MultiThreaded Disabled diff --git a/tools/ResourceUpdater/ResourceUpdater.vcxproj b/tools/ResourceUpdater/ResourceUpdater.vcxproj index 4796d3c0ea..f03f11f0dc 100644 --- a/tools/ResourceUpdater/ResourceUpdater.vcxproj +++ b/tools/ResourceUpdater/ResourceUpdater.vcxproj @@ -43,7 +43,7 @@ true NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpp20 /utf-8 /MP %(AdditionalOptions) diff --git a/tools/TestCaller/TestCaller.vcxproj b/tools/TestCaller/TestCaller.vcxproj index a921d22a52..ba683f4621 100644 --- a/tools/TestCaller/TestCaller.vcxproj +++ b/tools/TestCaller/TestCaller.vcxproj @@ -96,7 +96,7 @@ true LOG_TRACE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpp20 stdc11 MultiThreaded Disabled