37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 74bbd628eb904b8aa4d6258692d581edfe3865e5 Mon Sep 17 00:00:00 2001
|
|
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
|
|
Date: Sat, 30 Jan 2016 18:41:27 +0900
|
|
Subject: [PATCH] Fix compile error with gcc-6 which enables C++14 by default
|
|
|
|
Upstream-commit: 4e44fccdcf1d0fea6a8cd88916040e06fc75d9db
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
---
|
|
src/template.h | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/template.h b/src/template.h
|
|
index 0346034..b5862d5 100644
|
|
--- a/src/template.h
|
|
+++ b/src/template.h
|
|
@@ -38,6 +38,9 @@
|
|
|
|
namespace nghttp2 {
|
|
|
|
+#if __cplusplus > 201103L
|
|
+using std::make_unique;
|
|
+#else // __cplusplus <= 201103L
|
|
template <typename T, typename... U>
|
|
typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
|
|
make_unique(U &&... u) {
|
|
@@ -49,6 +52,7 @@ typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
|
|
make_unique(size_t size) {
|
|
return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]());
|
|
}
|
|
+#endif // __cplusplus <= 201103L
|
|
|
|
// std::forward is constexpr since C++14
|
|
template <typename... T>
|
|
--
|
|
2.5.0
|
|
|