aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/Common.h5
-rw-r--r--src/common/Logging/Log.cpp6
-rw-r--r--src/common/Metric/Metric.cpp6
3 files changed, 6 insertions, 11 deletions
diff --git a/src/common/Common.h b/src/common/Common.h
index 3f881039dda..2d497b213f7 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -121,9 +121,4 @@ TC_COMMON_API LocaleConstant GetLocaleByName(std::string const& name);
#define MAX_QUERY_LEN 32*1024
-namespace Trinity
-{
- using std::make_unique;
-}
-
#endif
diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
index 77820929a66..13720c4ba41 100644
--- a/src/common/Logging/Log.cpp
+++ b/src/common/Logging/Log.cpp
@@ -152,7 +152,7 @@ void Log::CreateLoggerFromConfig(std::string const& appenderName)
if (level < lowestLogLevel)
lowestLogLevel = level;
- logger = Trinity::make_unique<Logger>(name, level);
+ logger = std::make_unique<Logger>(name, level);
//fprintf(stdout, "Log::CreateLoggerFromConfig: Created Logger %s, Level %u\n", name.c_str(), level);
std::istringstream ss(*iter);
@@ -215,12 +215,12 @@ void Log::RegisterAppender(uint8 index, AppenderCreatorFn appenderCreateFn)
void Log::outMessage(std::string const& filter, LogLevel level, std::string&& message)
{
- write(Trinity::make_unique<LogMessage>(level, filter, std::move(message)));
+ write(std::make_unique<LogMessage>(level, filter, std::move(message)));
}
void Log::outCommand(std::string&& message, std::string&& param1)
{
- write(Trinity::make_unique<LogMessage>(LOG_LEVEL_INFO, "commands.gm", std::move(message), std::move(param1)));
+ write(std::make_unique<LogMessage>(LOG_LEVEL_INFO, "commands.gm", std::move(message), std::move(param1)));
}
void Log::write(std::unique_ptr<LogMessage>&& msg) const
diff --git a/src/common/Metric/Metric.cpp b/src/common/Metric/Metric.cpp
index 02fa87d8d96..b1302aacb5a 100644
--- a/src/common/Metric/Metric.cpp
+++ b/src/common/Metric/Metric.cpp
@@ -27,10 +27,10 @@
void Metric::Initialize(std::string const& realmName, Trinity::Asio::IoContext& ioContext, std::function<void()> overallStatusLogger)
{
- _dataStream = Trinity::make_unique<boost::asio::ip::tcp::iostream>();
+ _dataStream = std::make_unique<boost::asio::ip::tcp::iostream>();
_realmName = FormatInfluxDBTagValue(realmName);
- _batchTimer = Trinity::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
- _overallStatusTimer = Trinity::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
+ _batchTimer = std::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
+ _overallStatusTimer = std::make_unique<Trinity::Asio::DeadlineTimer>(ioContext);
_overallStatusLogger = overallStatusLogger;
LoadFromConfigs();
}