From c96849f431bb4152a4258d2480bef8cd272e0c6e Mon Sep 17 00:00:00 2001
From: tycho <work.tycho@gmail.com>
Date: Fri, 15 May 2015 13:57:27 +0100
Subject: Move make_unique into a namespace to avoid ADL issues this prevents
 VS finding std::make_unique for constructors that take types from std

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index d37ff0b32..9f57ad6bd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -376,7 +376,7 @@ std::unique_ptr<cMemorySettingsRepository> parseArguments(int argc, char **argv)
 		
 		int slots = slotsArg.getValue();
 
-		auto repo = make_unique<cMemorySettingsRepository>();
+		auto repo = cpp14::make_unique<cMemorySettingsRepository>();
 
 		repo->SetValueI("Server", "MaxPlayers", slots);
 
-- 
cgit v1.2.3