aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Main.cpp
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 01:04:02 +0200
commitd56c6710640e63fff6ead927b10d5135b9813bc6 (patch)
tree20acf562bed771e70e641d509ef97732542ed563 /src/server/worldserver/Main.cpp
parent4040e06e03fd1a4690261a89a8401bb4e84bcfc5 (diff)
Core/Dep: Boost 1.70 compatibility
(cherry picked from commit bcda8dd7421cfa1950a3e47081f2f28d032d38ac)
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r--src/server/worldserver/Main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index c5ccb1fec89..335b553a018 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -30,6 +30,7 @@
#include "Configuration/Config.h"
#include "DatabaseEnv.h"
#include "DatabaseLoader.h"
+#include "DeadlineTimer.h"
#include "GitRevision.h"
#include "InstanceSaveMgr.h"
#include "IoContext.h"
@@ -52,7 +53,6 @@
#include "WorldSocketMgr.h"
#include <openssl/opensslv.h>
#include <openssl/crypto.h>
-#include <boost/asio/deadline_timer.hpp>
#include <boost/asio/signal_set.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/program_options.hpp>
@@ -97,7 +97,7 @@ class FreezeDetector
static void Handler(std::weak_ptr<FreezeDetector> freezeDetectorRef, boost::system::error_code const& error);
private:
- boost::asio::deadline_timer _timer;
+ Trinity::Asio::DeadlineTimer _timer;
uint32 _worldLoopCounter;
uint32 _lastChangeMsTime;
uint32 _maxCoreStuckTimeInMs;