summaryrefslogtreecommitdiffstats
path: root/Utilities/std/cm/memory
diff options
context:
space:
mode:
authorMarc Chevrier <marc.chevrier@gmail.com>2020-01-27 16:48:34 (GMT)
committerMarc Chevrier <marc.chevrier@gmail.com>2020-01-28 16:38:17 (GMT)
commitfa828b8fba18ececb82f02910c05ad85820bca6b (patch)
treeaf6d9045592a552f09dea17e38e9bb096ab12b3d /Utilities/std/cm/memory
parent7706b6a71406b535ffe2f707647126eac4a8c767 (diff)
downloadCMake-fa828b8fba18ececb82f02910c05ad85820bca6b.zip
CMake-fa828b8fba18ececb82f02910c05ad85820bca6b.tar.gz
CMake-fa828b8fba18ececb82f02910c05ad85820bca6b.tar.bz2
STL support: make_unique can now handle array
Diffstat (limited to 'Utilities/std/cm/memory')
-rw-r--r--Utilities/std/cm/memory37
1 files changed, 36 insertions, 1 deletions
diff --git a/Utilities/std/cm/memory b/Utilities/std/cm/memory
index 8ebded2..dd0f822 100644
--- a/Utilities/std/cm/memory
+++ b/Utilities/std/cm/memory
@@ -8,6 +8,8 @@
#include <memory> // IWYU pragma: export
#if !defined(CMake_HAVE_CXX_MAKE_UNIQUE)
+# include <cstddef>
+# include <type_traits>
# include <utility>
#endif
@@ -19,12 +21,45 @@ using std::make_unique;
#else
+namespace internals {
+
+template <typename T>
+struct make_unique_if
+{
+ using single = std::unique_ptr<T>;
+};
+
+template <typename T>
+struct make_unique_if<T[]>
+{
+ using unbound_array = std::unique_ptr<T[]>;
+};
+
+template <typename T, std::size_t N>
+struct make_unique_if<T[N]>
+{
+ using bound_array = void;
+};
+}
+
template <typename T, typename... Args>
-std::unique_ptr<T> make_unique(Args&&... args)
+typename internals::make_unique_if<T>::single make_unique(Args&&... args)
{
return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
}
+template <typename T>
+typename internals::make_unique_if<T>::unbound_array make_unique(std::size_t n)
+{
+ using E = typename std::remove_extent<T>::type;
+
+ return std::unique_ptr<T>(new E[n]());
+}
+
+template <typename T, typename... Args>
+typename internals::make_unique_if<T>::bound_array make_unique(Args&&...) =
+ delete;
+
#endif
} // namespace cm