From b0255927f0c35f4c27d96ed79787d62811b23378 Mon Sep 17 00:00:00 2001
From: et65 <et65@ashbringer.fr>
Date: Wed, 22 Jul 2015 02:15:56 +0200
Subject: Core/Logging: Partial cherry-pick from commit c6ab951025b0be3b0f6 *
 solves differences 3.3.5 <-> 6.x because of make_unique workarround.

(cherry picked from commit c6ab951025b0be3b0f64dc8bb0703d4aa8bdb003)

Signed-off-by: Naios <naios-dev@live.de>
---
 src/server/shared/Logging/Log.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/server/shared/Logging')

diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h
index e22a06e635e..5b3782fce55 100644
--- a/src/server/shared/Logging/Log.h
+++ b/src/server/shared/Logging/Log.h
@@ -23,6 +23,7 @@
 #include "Appender.h"
 #include "Logger.h"
 #include "StringFormat.h"
+#include "Common.h"
 #include <boost/asio/io_service.hpp>
 #include <boost/asio/strand.hpp>
 
@@ -64,7 +65,7 @@ class Log
         template<typename... Args>
         inline void outMessage(std::string const& filter, LogLevel const level, const char* fmt, Args const&... args)
         {
-            write(std::unique_ptr<LogMessage>(new LogMessage(level, filter, Trinity::StringFormat(fmt, args...))));
+            write(Trinity::make_unique<LogMessage>(level, filter, Trinity::StringFormat(fmt, args...)));
         }
 
         template<typename... Args>
@@ -73,7 +74,7 @@ class Log
             if (!ShouldLog("commands.gm", LOG_LEVEL_INFO))
                 return;
 
-            std::unique_ptr<LogMessage> msg(new LogMessage(LOG_LEVEL_INFO, "commands.gm", std::move(Trinity::StringFormat(fmt, args...))));
+            std::unique_ptr<LogMessage> msg = Trinity::make_unique<LogMessage>(LOG_LEVEL_INFO, "commands.gm", std::move(Trinity::StringFormat(fmt, args...)));
 
             msg->param1 = std::to_string(account);
 
-- 
cgit v1.2.3