From 7cc66f48372ed45829ce8522040a3fe16f71a33e Mon Sep 17 00:00:00 2001
From: Andreas Schuh <andreas.schuh.84@gmail.com>
Date: Mon, 11 Nov 2019 12:33:32 +0000
Subject: [PATCH] fix: Revert to C++11 and provide alternative implementation
 for NewUnique

Also renamed recently added MakeUnique to NewUnique in alignment with NewShared.
---
 BasisProject.cmake                    |  2 +-
 Modules/Common/include/mirtk/Memory.h | 22 +++++++---------------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/BasisProject.cmake b/BasisProject.cmake
index 8eaa0d46b..eab55fa79 100644
--- a/BasisProject.cmake
+++ b/BasisProject.cmake
@@ -60,7 +60,7 @@ basis_project (
   LICENSE      "Apache License Version 2.0"
   CONTACT      "Andreas Schuh <andreas.schuh.84@gmail.com>"
   TEMPLATE     "with-basis-submodule/1.0"
-  LANGUAGES    C CXX-14
+  LANGUAGES    C CXX-11
  
   # --------------------------------------------------------------------------
   # directories
diff --git a/Modules/Common/include/mirtk/Memory.h b/Modules/Common/include/mirtk/Memory.h
index 2fe900c1d..e66e1d745 100644
--- a/Modules/Common/include/mirtk/Memory.h
+++ b/Modules/Common/include/mirtk/Memory.h
@@ -41,28 +41,20 @@ using SharedPtr = std::shared_ptr<T>;
 template <class T>
 using WeakPtr = std::weak_ptr<T>;
 
-template <class T>
-UniquePtr<T> MakeUnique()
-{
-  return std::make_unique<T>();
-}
-
 template <class T, class... Args>
-UniquePtr<T> MakeUnique(Args&&... args)
-{
-  return std::make_unique<T>(args...);
-}
-
-template <class T>
-SharedPtr<T> NewShared()
+UniquePtr<T> NewUnique(Args&&... args)
 {
-  return std::make_shared<T>();
+  #if __cplusplus == 201103L
+    return UniquePtr<T>(new T(std::forward<Args>(args)...));
+  #else
+    return std::make_unique<T>(std::forward<Args>(args)...);
+  #endif
 }
 
 template <class T, class... Args>
 SharedPtr<T> NewShared(Args&&... args)
 {
-  return std::make_shared<T>(args...);
+  return std::make_shared<T>(std::forward<Args>(args)...);
 }
 
 using std::memset;