Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Dep: Boost 1.70 compatibility

Browse Source 
(cherry picked from commit bcda8dd742)

# Conflicts:
#	src/server/authserver/Main.cpp
#	src/server/shared/Realm/RealmList.cpp
#	src/server/shared/Realm/RealmList.h
This commit is contained in:
Shauren
2019-04-14 00:13:23 +02:00
committed by Ovahlord
parent aa62a9c75f
commit 2fb644344d
8 changed files with 100 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/worldserver/Main.cpp
View File

@@ -31,6 +31,7 @@
#include "Configuration/Config.h"
#include "DatabaseEnv.h"
#include "DatabaseLoader.h"
#include "DeadlineTimer.h"
#include "GitRevision.h"
#include "InstanceSaveMgr.h"
#include "IoContext.h"
@@ -53,7 +54,6 @@
#include "ZmqContext.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>
@@ -102,7 +102,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;