From b0255927f0c35f4c27d96ed79787d62811b23378 Mon Sep 17 00:00:00 2001 From: et65 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 --- src/server/shared/Common.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/server/shared/Common.h') diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index dc4a4d231b1..09d64acc795 100644 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -38,6 +38,7 @@ #include #include #include +#include #include "Debugging/Errors.h" @@ -144,4 +145,14 @@ typedef std::vector StringVector; #define MAX_QUERY_LEN 32*1024 +namespace Trinity +{ + //! std::make_unique implementation (TODO: remove this once C++14 is supported) + template + std::unique_ptr make_unique(Args&& ...args) + { + return std::unique_ptr(new T(std::forward(args)...)); + } +} + #endif -- cgit v1.2.3