aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Database/PreparedStatement.h
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2014-06-24 13:17:23 -0500
committerSubv <subv2112@gmail.com>2014-06-24 13:17:41 -0500
commitf03d49705dc7a0c00350119b319dcf9feb566529 (patch)
treea60451bfe422d75a9378a4c124d7839be5e07789 /src/server/shared/Database/PreparedStatement.h
parent0a592dd9dbd34818deee472dd42d700b4746a27e (diff)
Core/Databases: Removed ACE dependencies on some of the database handling code.
Diffstat (limited to 'src/server/shared/Database/PreparedStatement.h')
-rw-r--r--src/server/shared/Database/PreparedStatement.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h
index 6afb309db2c..d69ee52a3e7 100644
--- a/src/server/shared/Database/PreparedStatement.h
+++ b/src/server/shared/Database/PreparedStatement.h
@@ -18,8 +18,8 @@
#ifndef _PREPAREDSTATEMENT_H
#define _PREPAREDSTATEMENT_H
+#include <future>
#include "SQLOperation.h"
-#include <ace/Future.h>
#ifdef __APPLE__
#undef TYPE_BOOL
@@ -153,14 +153,15 @@ class MySQLPreparedStatement
MySQLPreparedStatement& operator=(MySQLPreparedStatement const& right) = delete;
};
-typedef ACE_Future<PreparedQueryResult> PreparedQueryResultFuture;
+typedef std::future<PreparedQueryResult> PreparedQueryResultFuture;
+typedef std::promise<PreparedQueryResult> PreparedQueryResultPromise;
//- Lower-level class, enqueuable operation
class PreparedStatementTask : public SQLOperation
{
public:
PreparedStatementTask(PreparedStatement* stmt);
- PreparedStatementTask(PreparedStatement* stmt, PreparedQueryResultFuture result);
+ PreparedStatementTask(PreparedStatement* stmt, PreparedQueryResultPromise& result);
~PreparedStatementTask();
bool Execute();
@@ -168,6 +169,6 @@ class PreparedStatementTask : public SQLOperation
protected:
PreparedStatement* m_stmt;
bool m_has_result;
- PreparedQueryResultFuture m_result;
+ PreparedQueryResultPromise m_result;
};
#endif