diff options
author | leak <leak@bitmx.net> | 2014-07-01 00:54:09 +0200 |
---|---|---|
committer | leak <leak@bitmx.net> | 2014-07-01 00:54:09 +0200 |
commit | 029bad6698df6ac9556fe308342e616f4a7a8cc7 (patch) | |
tree | 01142dad7e748aba7799b9c296ccc4cf11db886f /src/server/shared/Threading/Callback.h | |
parent | d39a013b6b979a5158bf86c37a197cb902b2c2f9 (diff) |
Replaced all remaining ACE based Singletons
Replaced ACE base AutoPtr class with shared_ptr
Note: worldserver currently broken due to MapUpdater threading failure (ACE ofc, what else could it be)
Diffstat (limited to 'src/server/shared/Threading/Callback.h')
-rw-r--r-- | src/server/shared/Threading/Callback.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/server/shared/Threading/Callback.h b/src/server/shared/Threading/Callback.h index a6aa11b3958..5d9dc9a760d 100644 --- a/src/server/shared/Threading/Callback.h +++ b/src/server/shared/Threading/Callback.h @@ -26,10 +26,6 @@ typedef std::promise<QueryResult> QueryResultPromise; typedef std::future<PreparedQueryResult> PreparedQueryResultFuture; typedef std::promise<PreparedQueryResult> PreparedQueryResultPromise; -/*! A simple template using ACE_Future to manage callbacks from the thread and object that - issued the request. <ParamType> is variable type of parameter that is used as parameter - for the callback function. -*/ #define CALLBACK_STAGE_INVALID uint8(-1) template <typename Result, typename ParamType, bool chain = false> @@ -210,4 +206,4 @@ class QueryCallback_2 QueryCallback_2& operator=(QueryCallback_2 const& right) = delete; }; -#endif
\ No newline at end of file +#endif |