From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Sat, 10 Feb 2018 14:20:03 +0000 (+0100)
Subject: Implement std_cxx14::make_unique also for unbounded C-style arrays
X-Git-Tag: v9.0.0-rc1~425^2~12
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eca18e8562d82e833b6f612951aaa7bddd83f1a;p=dealii.git

Implement std_cxx14::make_unique also for unbounded C-style arrays
---

diff --git a/include/deal.II/base/std_cxx14/memory.h b/include/deal.II/base/std_cxx14/memory.h
index e7f6d82bf5..6970f5a069 100644
--- a/include/deal.II/base/std_cxx14/memory.h
+++ b/include/deal.II/base/std_cxx14/memory.h
@@ -30,15 +30,39 @@ namespace std_cxx14
 #ifdef DEAL_II_WITH_CXX14
   using std::make_unique;
 #else
+  namespace internal
+  {
+    template <typename T>
+    struct is_bounded_array
+    {
+      static constexpr bool value = false;
+    };
+
+    template <typename T, std::size_t N>
+    struct is_bounded_array<T[N]>
+    {
+      static constexpr bool value = true;
+    };
+  }
+
   template <typename T, typename... Args>
   inline
-  std::unique_ptr<T>
+  typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T> >::type
   make_unique(Args &&... constructor_arguments)
   {
-    static_assert(!std::is_array<T>::value,
-                  "This function is not implemented for array types.");
     return std::unique_ptr<T>(new T(std::forward<Args>(constructor_arguments)...));
   }
+
+  template <typename T>
+  inline
+  typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T> >::type
+  make_unique(std::size_t n)
+  {
+    static_assert(!internal::is_bounded_array<T>::value,
+                  "This function is not implemented for bounded array types.");
+    return std::unique_ptr<T>(new typename std::remove_extent<T>::type [n]);
+  }
+
 #endif
 }
 DEAL_II_NAMESPACE_CLOSE