aboutsummaryrefslogtreecommitdiff
path: root/src/server/shared/Realm
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2019-04-14 00:13:23 +0200
committerShauren <shauren.trinity@gmail.com>2019-04-14 00:13:23 +0200
commitbcda8dd7421cfa1950a3e47081f2f28d032d38ac (patch)
treed751264dc0fbce02f94b6bc3c42238f785605d91 /src/server/shared/Realm
parent18aca970ce1042535945fca53e13fd7059aa2a50 (diff)
Core/Dep: Boost 1.70 compatibility
Diffstat (limited to 'src/server/shared/Realm')
-rw-r--r--src/server/shared/Realm/RealmList.cpp4
-rw-r--r--src/server/shared/Realm/RealmList.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/shared/Realm/RealmList.cpp b/src/server/shared/Realm/RealmList.cpp
index adffbbc9ae6..49dac39cef5 100644
--- a/src/server/shared/Realm/RealmList.cpp
+++ b/src/server/shared/Realm/RealmList.cpp
@@ -20,6 +20,7 @@
#include "BattlenetRpcErrorCodes.h"
#include "BigNumber.h"
#include "DatabaseEnv.h"
+#include "DeadlineTimer.h"
#include "Errors.h"
#include "IoContext.h"
#include "Log.h"
@@ -28,7 +29,6 @@
#include "Util.h"
#include "game_utilities_service.pb.h"
#include "RealmList.pb.h"
-#include <boost/asio/deadline_timer.hpp>
#include <boost/asio/ip/tcp.hpp>
#include <boost/thread/locks.hpp>
#include <boost/thread/shared_mutex.hpp>
@@ -53,7 +53,7 @@ RealmList* RealmList::Instance()
void RealmList::Initialize(Trinity::Asio::IoContext& ioContext, uint32 updateInterval)
{
_updateInterval = updateInterval;
- _updateTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioContext);
+ _updateTimer = Trinity::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
_resolver = Trinity::make_unique<boost::asio::ip::tcp::resolver>(ioContext);
// Get the content of the realmlist table in the database
diff --git a/src/server/shared/Realm/RealmList.h b/src/server/shared/Realm/RealmList.h
index e763841f1ae..2bacdf308ee 100644
--- a/src/server/shared/Realm/RealmList.h
+++ b/src/server/shared/Realm/RealmList.h
@@ -72,6 +72,7 @@ namespace Trinity
namespace Asio
{
class IoContext;
+ class DeadlineTimer;
}
}
@@ -109,7 +110,7 @@ private:
RealmMap _realms;
std::unordered_set<std::string> _subRegions;
uint32 _updateInterval;
- std::unique_ptr<boost::asio::deadline_timer> _updateTimer;
+ std::unique_ptr<Trinity::Asio::DeadlineTimer> _updateTimer;
std::unique_ptr<boost::asio::ip::tcp_resolver> _resolver;
};