From 8085cb0621458afc2ae9051cd9ed384ee2083d52 Mon Sep 17 00:00:00 2001
From: Omar Shrit <omar@shrit.me>
Date: Mon, 28 Sep 2020 18:20:26 +0200
Subject: [PATCH] Resolve doube make_unique definition in VS

Signed-off-by: Omar Shrit <omar@shrit.me>
---
 .ci/windows-steps.yaml                     | 2 +-
 src/mlpack/core/cereal/pointer_wrapper.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/windows-steps.yaml b/.ci/windows-steps.yaml
index 19560d8384..fb258ba0ca 100644
--- a/.ci/windows-steps.yaml
+++ b/.ci/windows-steps.yaml
@@ -45,7 +45,7 @@ steps:
     msbuildVersion: $(MSBuildVersion)
     configuration: 'Release'
     msbuildArchitecture: 'x64'
-#    msbuildArguments: /m /p:BuildInParallel=true
+    msbuildArguments: /m /p:BuildInParallel=true
     clean: false
     maximumCpuCount: false
   displayName: 'Build armadillo'
diff --git a/src/mlpack/core/cereal/pointer_wrapper.hpp b/src/mlpack/core/cereal/pointer_wrapper.hpp
index c417a7d719..299266436b 100644
--- a/src/mlpack/core/cereal/pointer_wrapper.hpp
+++ b/src/mlpack/core/cereal/pointer_wrapper.hpp
@@ -19,7 +19,7 @@
 #include <cereal/archives/xml.hpp>
 #include <cereal/types/memory.hpp>
 
-#if __cplusplus <= 201103L
+#if __cplusplus <= 201103L && !defined(_MSC_VER)
 namespace std {
 template<typename T, typename... Args>
 std::unique_ptr<T> make_unique(Args&&... args)