Core/Dep: Boost 1.70 compatibility
(cherry picked from commit bcda8dd7421cfa1950a3e47081f2f28d032d38ac) # Conflicts: # src/server/authserver/Main.cpp # src/server/shared/Realm/RealmList.cpp # src/server/shared/Realm/RealmList.h
This commit is contained in:
1 parent
aa62a9c75f
commit
2fb644344d
8 files changed
+100
-42
No files matched your search
@@ -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__
|
||||
Reference in new issue
Block a user