diff options
author | Shauren <shauren.trinity@gmail.com> | 2019-04-14 00:13:23 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2019-04-14 00:13:23 +0200 |
commit | bcda8dd7421cfa1950a3e47081f2f28d032d38ac (patch) | |
tree | d751264dc0fbce02f94b6bc3c42238f785605d91 /src/common/Metric | |
parent | 18aca970ce1042535945fca53e13fd7059aa2a50 (diff) |
Core/Dep: Boost 1.70 compatibility
Diffstat (limited to 'src/common/Metric')
-rw-r--r-- | src/common/Metric/Metric.cpp | 6 | ||||
-rw-r--r-- | src/common/Metric/Metric.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp index 46988b8c0dd..392e2cd142f 100644 --- a/src/common/Metric/Metric.cpp +++ b/src/common/Metric/Metric.cpp @@ -18,19 +18,19 @@ #include "Metric.h" #include "Common.h" #include "Config.h" +#include "DeadlineTimer.h" #include "Log.h" #include "Strand.h" #include "Util.h" #include <boost/algorithm/string/replace.hpp> -#include <boost/asio/deadline_timer.hpp> #include <boost/asio/ip/tcp.hpp> void Metric::Initialize(std::string const& realmName, Trinity::Asio::IoContext& ioContext, std::function<void()> overallStatusLogger) { _dataStream = Trinity::make_unique<boost::asio::ip::tcp::iostream>(); _realmName = FormatInfluxDBTagValue(realmName); - _batchTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioContext); - _overallStatusTimer = Trinity::make_unique<boost::asio::deadline_timer>(ioContext); + _batchTimer = Trinity::make_unique<Trinity::Asio::DeadlineTimer>(ioContext); + _overallStatusTimer = Trinity::make_unique<Trinity::Asio::DeadlineTimer>(ioContext); _overallStatusLogger = overallStatusLogger; LoadFromConfigs(); } diff --git a/src/common/Metric/Metric.h b/src/common/Metric/Metric.h index 630d72df288..42e2117ebd8 100644 --- a/src/common/Metric/Metric.h +++ b/src/common/Metric/Metric.h @@ -19,7 +19,6 @@ #define METRIC_H__ #include "Define.h" -#include "AsioHacksFwd.h" #include "MPSCQueue.h" #include <chrono> #include <functional> @@ -32,6 +31,7 @@ namespace Trinity namespace Asio { class IoContext; + class DeadlineTimer; } } @@ -61,8 +61,8 @@ private: std::iostream& GetDataStream() { return *_dataStream; } std::unique_ptr<std::iostream> _dataStream; MPSCQueue<MetricData> _queuedData; - std::unique_ptr<boost::asio::deadline_timer> _batchTimer; - std::unique_ptr<boost::asio::deadline_timer> _overallStatusTimer; + std::unique_ptr<Trinity::Asio::DeadlineTimer> _batchTimer; + std::unique_ptr<Trinity::Asio::DeadlineTimer> _overallStatusTimer; int32 _updateInterval = 0; int32 _overallStatusTimerInterval = 0; bool _enabled = false; |