Imported Upstream version 1.46.0

[platform/upstream/nghttp2.git] / src / template.h

diff --git a/src/template.h b/src/template.h
index b2f850d..530a1d1 100644 (file)
--- a/src/template.h
+++ b/src/template.h
@@ -45,7 +45,7 @@ template <typename... T>
 constexpr std::array<
     typename std::decay<typename std::common_type<T...>::type>::type,
     sizeof...(T)>
-make_array(T &&... t) {
+make_array(T &&...t) {
   return std::array<
       typename std::decay<typename std::common_type<T...>::type>::type,
       sizeof...(T)>{{std::forward<T>(t)...}};
@@ -62,7 +62,7 @@ template <typename T, size_t N> constexpr size_t str_size(T (&)[N]) {
 // inspired by <http://blog.korfuri.fr/post/go-defer-in-cpp/>, but our
 // template can take functions returning other than void.
 template <typename F, typename... T> struct Defer {
-  Defer(F &&f, T &&... t)
+  Defer(F &&f, T &&...t)
       : f(std::bind(std::forward<F>(f), std::forward<T>(t)...)) {}
   Defer(Defer &&o) noexcept : f(std::move(o.f)) {}
   ~Defer() { f(); }
@@ -72,7 +72,7 @@ template <typename F, typename... T> struct Defer {
   std::function<ResultType()> f;
 };
 
-template <typename F, typename... T> Defer<F, T...> defer(F &&f, T &&... t) {
+template <typename F, typename... T> Defer<F, T...> defer(F &&f, T &&...t) {
   return Defer<F, T...>(std::forward<F>(f), std::forward<T>(t)...);
 }