Merge branch 'master' into Playerbot

2026-03-04 08:17:48 +00:00 · 2024-10-04 21:57:35 +08:00
parent 9ebdbd8459 9f58d55a1d
commit 6eb5070cbc
90 changed files with 381 additions and 169 deletions
--- a/src/server/shared/DataStores/DBCDatabaseLoader.cpp
+++ b/src/server/shared/DataStores/DBCDatabaseLoader.cpp
@@ -18,6 +18,7 @@
 #include "DBCDatabaseLoader.h"
 #include "DatabaseEnv.h"
 #include "Errors.h"
+#include "QueryResult.h"
 #include "StringFormat.h"

 DBCDatabaseLoader::DBCDatabaseLoader(char const* tableName, char const* dbcFormatString, std::vector<char*>& stringPool)
--- a/src/server/shared/DataStores/DBCDatabaseLoader.h
+++ b/src/server/shared/DataStores/DBCDatabaseLoader.h
@@ -19,7 +19,6 @@
 #define DBCDatabaseLoader_h__

 #include "DBCFileLoader.h"
-#include <string>
 #include <vector>

 struct DBCDatabaseLoader
--- a/src/server/shared/DataStores/DBCStorageIterator.h
+++ b/src/server/shared/DataStores/DBCStorageIterator.h
@@ -19,7 +19,6 @@
 #define DBCStorageIterator_h__

 #include "Define.h"
-#include <iterator>

 template <class T>
 class DBCStorageIterator
--- a/src/server/shared/DataStores/DBCStructure.h
+++ b/src/server/shared/DataStores/DBCStructure.h
@@ -20,7 +20,6 @@

 #include "DBCEnums.h"
 #include "Define.h"
-#include "SharedDefines.h"
 #include "Util.h"
 #include <array>
 #include <map>