From 7e538980a2b4fc6c74bde7bd456633d954272708 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 12 May 2017 18:49:51 +0200 Subject: Core/Database: Include cleanup --- src/server/database/Database/QueryCallback.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/server/database/Database/QueryCallback.h') diff --git a/src/server/database/Database/QueryCallback.h b/src/server/database/Database/QueryCallback.h index 8258da37afb..ebc1538b5e9 100644 --- a/src/server/database/Database/QueryCallback.h +++ b/src/server/database/Database/QueryCallback.h @@ -18,16 +18,19 @@ #ifndef _QUERY_CALLBACK_H #define _QUERY_CALLBACK_H -#include "QueryResult.h" +#include "Define.h" +#include "DatabaseEnvFwd.h" +#include #include #include #include +#include class TC_DATABASE_API QueryCallback { public: - explicit QueryCallback(std::future&& result); - explicit QueryCallback(std::future&& result); + explicit QueryCallback(QueryResultFuture&& result); + explicit QueryCallback(PreparedQueryResultFuture&& result); QueryCallback(QueryCallback&& right); QueryCallback& operator=(QueryCallback&& right); ~QueryCallback(); @@ -60,8 +63,8 @@ private: union { - std::future _string; - std::future _prepared; + QueryResultFuture _string; + PreparedQueryResultFuture _prepared; }; bool _isPrepared; -- cgit v1.2.3