From 9a229b824f2bb9cbe3d44ffdf05f6167577aad7e Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Sun, 30 Oct 2011 14:48:10 +0900
Subject: [PATCH] =?UTF-8?q?make=5Farray=20=E4=BB=95=E6=A7=98=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=20make=5Fcommon=5Farray=20=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sprout/array.hpp          | 17 +++++++++++------
 sprout/math/factorial.hpp |  9 ++++++++-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/sprout/array.hpp b/sprout/array.hpp
index 87d498b2..d1c29fc4 100644
--- a/sprout/array.hpp
+++ b/sprout/array.hpp
@@ -11,6 +11,7 @@
 #include <sprout/fixed_container/traits.hpp>
 #include <sprout/fixed_container/functions.hpp>
 #include <sprout/iterator.hpp>
+#include <sprout/utility/forward.hpp>
 #include HDR_ALGORITHM_SSCRISK_CEL_OR_SPROUT_DETAIL
 #if SPROUT_USE_INDEX_ITERATOR_IMPLEMENTATION
 #	include <sprout/iterator/index_iterator.hpp>
@@ -245,13 +246,17 @@ namespace sprout {
 	//
 	// make_array
 	//
-	template<typename T, typename... Tail>
-	SPROUT_CONSTEXPR inline sprout::array<T, 1 + sizeof...(Tail)> make_array(T const& head, Tail const&... tail) {
-		return sprout::array<T, 1 + sizeof...(Tail)>{{head, tail...}};
+	template<typename T, typename... Types>
+	SPROUT_CONSTEXPR inline sprout::array<T, sizeof...(Types)> make_array(Types&&... args) {
+		return sprout::array<typename std::decay<T>::type, sizeof...(Types)>{{sprout::forward<Types>(args)...}};
 	}
-	template<typename T>
-	SPROUT_CONSTEXPR inline sprout::array<T, 0> make_array() {
-		return sprout::array<T, 0>{};
+
+	//
+	// make_common_array
+	//
+	template<typename... Types>
+	SPROUT_CONSTEXPR inline sprout::array<typename std::common_type<typename std::decay<Types>::type...>::type, sizeof...(Types)> make_common_array(Types&&... args) {
+		return sprout::array<typename std::common_type<typename std::decay<Types>::type...>::type, sizeof...(Types)>{{sprout::forward<Types>(args)...}};
 	}
 
 	namespace detail {
diff --git a/sprout/math/factorial.hpp b/sprout/math/factorial.hpp
index f86aee9d..ed2239e0 100644
--- a/sprout/math/factorial.hpp
+++ b/sprout/math/factorial.hpp
@@ -629,11 +629,18 @@ namespace sprout {
 			SPROUT_CONSTEXPR typename sprout::math::detail::factorials<long double>::table_type sprout::math::detail::factorials<long double>::table;
 		}	// namespace detail
 		//
+		// factorial_limit
+		//
+		template<typename T>
+		SPROUT_CONSTEXPR std::size_t factorial_limit() {
+			return sprout::math::detail::factorials<T>::limit;
+		}
+		//
 		// factorial
 		//
 		template<typename T>
 		SPROUT_CONSTEXPR T factorial(std::size_t x) {
-			return x <= sprout::math::detail::factorials<T>::limit
+			return x <= sprout::math::factorial_limit<T>()
 				? sprout::math::detail::factorials<T>::table[x]
 				: throw std::invalid_argument("factorial(): argument limit exceeded")
 				;