aboutsummaryrefslogtreecommitdiff
path: root/src/common/Logging/Log.h
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2018-01-06 12:28:38 +0100
committerShauren <shauren.trinity@gmail.com>2018-01-06 12:30:28 +0100
commitb2b4f9d1e4562ec246efb5136c1c674ec78f50b7 (patch)
treeba0d81ce1ba02528599030fde736f30c19d49d72 /src/common/Logging/Log.h
parent6da6f1b415be2e7964c7c15c87b29a38052e76e4 (diff)
Core/Misc: Added compatibility layer for boost 1.66 and future std:: networking stuff
* Based on work done by @dimiandre in PR #21173 Closes #21171 Closes #21173 (cherry picked from commit dfd2660a85e4f0891c63009ee8425b2796586409)
Diffstat (limited to 'src/common/Logging/Log.h')
-rw-r--r--src/common/Logging/Log.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h
index 80b52681ea1..740ffaf03c9 100644
--- a/src/common/Logging/Log.h
+++ b/src/common/Logging/Log.h
@@ -32,11 +32,11 @@ class Appender;
class Logger;
struct LogMessage;
-namespace boost
+namespace Trinity
{
- namespace asio
+ namespace Asio
{
- class io_service;
+ class IoContext;
}
}
@@ -65,7 +65,7 @@ class TC_COMMON_API Log
public:
static Log* instance();
- void Initialize(boost::asio::io_service* ioService);
+ void Initialize(Trinity::Asio::IoContext* ioContext);
void SetSynchronous(); // Not threadsafe - should only be called from main() after all threads are joined
void LoadFromConfig();
void Close();
@@ -125,8 +125,8 @@ class TC_COMMON_API Log
std::string m_logsDir;
std::string m_logsTimestamp;
- boost::asio::io_service* _ioService;
- Trinity::AsioStrand* _strand;
+ Trinity::Asio::IoContext* _ioContext;
+ Trinity::Asio::Strand* _strand;
};
#define sLog Log::instance()