Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-11 04:28:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Dep: Boost 1.70 compatibility

Browse Source
This commit is contained in:
Shauren
2019-04-14 00:13:23 +02:00
parent 18aca970ce
commit bcda8dd742
10 changed files with 103 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/shared/Networking/NetworkThread.h
View File

@@ -19,12 +19,12 @@
#define NetworkThread_h__
#include "Define.h"
#include "DeadlineTimer.h"
#include "Errors.h"
#include "IoContext.h"
#include "Log.h"
#include "Timer.h"
#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/deadline_timer.hpp>
#include <atomic>
#include <chrono>
#include <memory>
@@ -173,7 +173,7 @@ private:
Trinity::Asio::IoContext _ioContext;
tcp::socket _acceptSocket;
boost::asio::deadline_timer _updateTimer;
Trinity::Asio::DeadlineTimer _updateTimer;
};
#endif // NetworkThread_h__

4
src/server/shared/Realm/RealmList.cpp
View File

@@ -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

3
src/server/shared/Realm/RealmList.h
View File

@@ -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;
};