fix: fix compile by including span manually

LiteLDev · Nov 29, 2024 · 361cecc · 361cecc
1 parent 919f249
commit 361cecc
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 34 deletions.
diff --git a/src/legacy/engine/EngineManager.cpp b/src/legacy/engine/EngineManager.cpp
@@ -3,7 +3,6 @@
 #include "engine/EngineOwnData.h"
 #include "engine/GlobalShareData.h"
 #include "ll/api/utils/StringUtils.h"
-#include "main/NodeJsHelper.h"
 
 #include <map>
 #include <mutex>

diff --git a/src/legacy/engine/EngineOwnData.h b/src/legacy/engine/EngineOwnData.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <span> // For fixing compile
 #include "dyncall/dyncall.h"
 #include "ll/api/base/Macro.h"
 #include "main/Configs.h"

diff --git a/src/legacy/legacyapi/command/DynamicCommand.h b/src/legacy/legacyapi/command/DynamicCommand.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <span> // For fixing compile
 #include "fmt/core.h"
 #include "ll/api/base/Concepts.h"
 #include "ll/api/base/Macro.h"

diff --git a/src/legacy/legacyapi/db/Types.h b/src/legacy/legacyapi/db/Types.h
@@ -1,5 +1,6 @@
 #pragma once
 #include <vector>
+#include <span> // For fixing compile
 // #define LLDB_DEBUG_MODE
 
 namespace DB {

diff --git a/src/legacy/legacyapi/form/FormPacketHelper.h b/src/legacy/legacyapi/form/FormPacketHelper.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <span> // For fixing compile
 #include "FormUI.h"
 #include "mc/world/actor/player/Player.h"
 

diff --git a/src/legacy/legacyapi/utils/FileHelper.cpp b/src/legacy/legacyapi/utils/FileHelper.cpp
@@ -1,9 +1,6 @@
 #include "FileHelper.h"
-
 #include "ll/api/utils/StringUtils.h"
-
 #include <filesystem>
-#include <io.h>
 
 namespace lse::legacy {
 

diff --git a/src/legacy/legacyapi/utils/FileHelper.h b/src/legacy/legacyapi/utils/FileHelper.h
@@ -1,6 +1,6 @@
 #pragma once
+#include <span> // For fixing compile
 #include "ll/api/base/Macro.h"
-
 #include <Windows.h>
 #include <ll/api/Expected.h>
 #include <ll/api/Logger.h>

diff --git a/src/legacy/main/NodeJsHelper.cpp b/src/legacy/main/NodeJsHelper.cpp
@@ -1,25 +1,25 @@
-#include <ll/api/chrono/GameChrono.h>
-#include <ll/api/service/ServerInfo.h>
-
 #pragma warning(disable : 4251)
-#include "main/Configs.h"
+
 #if defined(LEGACY_SCRIPT_ENGINE_BACKEND_NODEJS)
+#include "main/NodeJsHelper.h"
+#include "ll/api/chrono/GameChrono.h"
+#include "ll/api/service/ServerInfo.h"
+#include "main/Configs.h"
 #include "api/CommandAPI.h"
 #include "api/CommandCompatibleAPI.h"
 #include "api/EventAPI.h"
 #include "engine/EngineManager.h"
 #include "engine/EngineOwnData.h"
 #include "engine/RemoteCall.h"
 #include "main/Global.h"
-#include "main/NodeJsHelper.h"
 
 #include <functional>
-#include <ll/api/io/FileUtils.h>
-#include <ll/api/schedule/Scheduler.h>
-#include <ll/api/schedule/Task.h>
-#include <ll/api/utils/StringUtils.h>
-#include <uv/uv.h>
-#include <v8/v8.h>
+#include "ll/api/io/FileUtils.h"
+#include "ll/api/schedule/Scheduler.h"
+#include "ll/api/schedule/Task.h"
+#include "ll/api/utils/StringUtils.h"
+#include "uv/uv.h"
+#include "v8/v8.h"
 
 ll::schedule::ServerTimeScheduler nodeScheduler;
 using ll::chrono_literals::operator""_tick;

diff --git a/src/legacy/main/NodeJsHelper.h b/src/legacy/main/NodeJsHelper.h
@@ -1,6 +1,7 @@
 #pragma once
 #if defined(LEGACY_SCRIPT_ENGINE_BACKEND_NODEJS)
 #pragma warning(disable : 4251)
+#include <span> // For fixing compile
 #include "main/Configs.h"
 
 #include <ScriptX/ScriptX.h>

diff --git a/src/legacy/utils/IniHelper.cpp b/src/legacy/utils/IniHelper.cpp
@@ -1,8 +1,6 @@
 #include "utils/IniHelper.h"
-
 #include "ll/api/Logger.h"
 #include "lse/Entry.h"
-
 #include <filesystem>
 
 SimpleIni* SimpleIni::create(const std::string& path, const std::string& defContent) {

diff --git a/src/legacy/utils/IniHelper.h b/src/legacy/utils/IniHelper.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "SimpleIni.h"
-
+#include <span> // For fixing compile
 #include <string>
 
 using std::string;

diff --git a/src/lse/Entry.cpp b/src/lse/Entry.cpp
@@ -9,18 +9,13 @@
 
 #include <ScriptX/ScriptX.h>
 #include <exception>
-#include <fmt/format.h>
-#include <functional>
 #include <ll/api/Config.h>
-#include <ll/api/Logger.h>
 #include <ll/api/i18n/I18n.h>
 #include <ll/api/io/FileUtils.h>
 #include <ll/api/mod/ModManagerRegistry.h>
 #include <ll/api/mod/NativeMod.h>
 #include <ll/api/utils/ErrorUtils.h>
-#include <ll/api/utils/StringUtils.h>
 #include <memory>
-#include <processenv.h>
 #include <stdexcept>
 
 #ifdef LEGACY_SCRIPT_ENGINE_BACKEND_LUA

diff --git a/src/lse/Entry.h b/src/lse/Entry.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <span>
 #include "Config.h"
 #include "PluginManager.h"
 

diff --git a/src/lse/Plugin.cpp b/src/lse/Plugin.cpp
@@ -1,6 +1,5 @@
-#include "Plugin.h"
-
 #include "Entry.h"
+#include "Plugin.h"
 #include "legacy/engine/EngineOwnData.h"
 #include "ll/api/mod/Mod.h"
 

diff --git a/src/lse/PluginManager.cpp b/src/lse/PluginManager.cpp
@@ -1,16 +1,13 @@
-#include "PluginManager.h"
-
 #include "Entry.h"
+#include "PluginManager.h"
 #include "Plugin.h"
 #include "legacy/api/EventAPI.h"
 #include "legacy/engine/EngineManager.h"
 #include "legacy/engine/EngineOwnData.h"
-
 #include <ScriptX/ScriptX.h>
 #include <exception>
 #include <filesystem>
 #include <fmt/format.h>
-#include <ll/api/Logger.h>
 #include <ll/api/io/FileUtils.h>
 #include <ll/api/mod/Mod.h>
 #include <ll/api/mod/ModManager.h>

diff --git a/src/lse/PluginMigration.cpp b/src/lse/PluginMigration.cpp
@@ -1,8 +1,5 @@
-#include "PluginMigration.h"
-
 #include "Entry.h"
-#include "legacy/legacyapi/utils/FileHelper.h"
-
+#include "PluginMigration.h"
 #include <filesystem>
 #include <fmt/format.h>
 #include <fstream>