From 85a7d5ce9ac68b30da2277cc91d4b70358f1880d Mon Sep 17 00:00:00 2001
From: ariel- <ariel-@users.noreply.github.com>
Date: Mon, 19 Jun 2017 23:20:06 -0300
Subject: Core: ported headers cleanup from master branch

---
 src/server/database/Database/QueryCallback.h | 15 ++++++++++-----
 1 file changed, 10 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 f9c93000da7..ebc1538b5e9 100644
--- a/src/server/database/Database/QueryCallback.h
+++ b/src/server/database/Database/QueryCallback.h
@@ -18,14 +18,19 @@
 #ifndef _QUERY_CALLBACK_H
 #define _QUERY_CALLBACK_H
 
-#include "QueryResult.h"
+#include "Define.h"
+#include "DatabaseEnvFwd.h"
+#include <functional>
 #include <future>
+#include <list>
+#include <queue>
+#include <utility>
 
 class TC_DATABASE_API QueryCallback
 {
 public:
-    explicit QueryCallback(std::future<QueryResult>&& result);
-    explicit QueryCallback(std::future<PreparedQueryResult>&& result);
+    explicit QueryCallback(QueryResultFuture&& result);
+    explicit QueryCallback(PreparedQueryResultFuture&& result);
     QueryCallback(QueryCallback&& right);
     QueryCallback& operator=(QueryCallback&& right);
     ~QueryCallback();
@@ -58,8 +63,8 @@ private:
 
     union
     {
-        std::future<QueryResult> _string;
-        std::future<PreparedQueryResult> _prepared;
+        QueryResultFuture _string;
+        PreparedQueryResultFuture _prepared;
     };
     bool _isPrepared;
 
-- 
cgit v1.2.3