Resolve doube make_unique definition in VS

Signed-off-by: Omar Shrit <omar@shrit.me>
2020-09-28 18:20:26 +02:00
parent 4084845e23
commit 8085cb0621
2 changed files with 2 additions and 2 deletions
@@ -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'
@@ -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)