From 64d571ad337998fd8f4d04e1113c2277d855fbd5 Mon Sep 17 00:00:00 2001
From: zzyyyl <aysyxx53@hotmail.com>
Date: Sun, 31 Jul 2022 15:10:51 +0800
Subject: [PATCH] =?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 <opencv2/opencv.hpp>
+#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 <thread>
 #include <regex>
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/opencv.hpp>
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 #include <utility>
 
 #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 <ctime>
 
 #include <meojson/json.hpp>
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/opencv.hpp>
+#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 <string>
 #include <unordered_map>
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/core/mat.hpp>
+#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 <opencv2/core/mat.hpp>
+#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 <vector>
 #include <memory>
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/opencv.hpp>
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
+#ifdef _MSC_VER
 #pragma warning( push )
 #pragma warning( disable : 4068)
+#endif
 #include <zlib/decompress.hpp>
+#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 <Windows.h>
 #endif
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/opencv.hpp>
+#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 <algorithm>
 #include <vector>
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/opencv.hpp>
+#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 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <Optimization>MaxSpeed</Optimization>
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 <filesystem>
 
 #include <PaddleOCR/paddle_ocr.h>
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/opencv.hpp>
+#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 <unordered_map>
 #include <unordered_set>
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/opencv.hpp>
+#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 <Arknights-Tile-Pos/TileCalc.hpp>
+#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 <fstream>
 #include <unordered_set>
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 #include <opencv2/opencv.hpp>
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 #include <meojson/json.hpp>
 
 bool update_items_data(const std::filesystem::path& input_dir, const std::filesystem::path& output_dir);