From 99604a589c04c52a5d0af77d1717e48b59d721e2 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Mon, 14 Oct 2019 19:12:17 +1100 Subject: [PATCH] should actually build now... hopefully... --- deps/mysqlConnector/Connection.cpp | 4 ++++ deps/mysqlConnector/Connection.h | 2 ++ src/api/PlayerMinimal.h | 5 +++-- src/common/Database/DbCommon.h | 2 ++ src/world/Linkshell/Linkshell.h | 2 ++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/deps/mysqlConnector/Connection.cpp b/deps/mysqlConnector/Connection.cpp index 9b317dc9..df6a28f0 100644 --- a/deps/mysqlConnector/Connection.cpp +++ b/deps/mysqlConnector/Connection.cpp @@ -4,6 +4,10 @@ #include "PreparedStatement.h" #include +#ifdef _MSC_VER + // fixes compile error when compiling with vs2019 + #include +#endif #include Mysql::Connection::Connection( std::shared_ptr< MySqlBase > pBase, diff --git a/deps/mysqlConnector/Connection.h b/deps/mysqlConnector/Connection.h index 1283ead5..43cc6e07 100644 --- a/deps/mysqlConnector/Connection.h +++ b/deps/mysqlConnector/Connection.h @@ -3,6 +3,8 @@ #include #include +#include + #include "MysqlCommon.h" typedef struct st_mysql MYSQL; diff --git a/src/api/PlayerMinimal.h b/src/api/PlayerMinimal.h index d51251c2..a5e41b7b 100644 --- a/src/api/PlayerMinimal.h +++ b/src/api/PlayerMinimal.h @@ -2,8 +2,9 @@ #define _PLAYERMINIMAL_H #include -#include -#include +#include +#include +#include namespace Sapphire::Api { diff --git a/src/common/Database/DbCommon.h b/src/common/Database/DbCommon.h index 89d537b6..d702ce72 100644 --- a/src/common/Database/DbCommon.h +++ b/src/common/Database/DbCommon.h @@ -1,6 +1,8 @@ #ifndef SAPPHIRE_DBCOMMON_H #define SAPPHIRE_DBCOMMON_H +#include + namespace Sapphire::Db { struct ConnectionInfo diff --git a/src/world/Linkshell/Linkshell.h b/src/world/Linkshell/Linkshell.h index 31d32717..b8b46079 100644 --- a/src/world/Linkshell/Linkshell.h +++ b/src/world/Linkshell/Linkshell.h @@ -3,6 +3,8 @@ #include #include +#include + namespace Sapphire {