From cb23ccdd557fa547aabc85cf5cbec35865043fbf Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Sat, 16 Aug 2014 17:35:36 +0900
Subject: [PATCH] fix index_tuple implementation

---
 sprout/index_tuple/index_tuple.hpp | 50 ++++++++++++++----------------
 sprout/static_assert.hpp           |  4 +--
 sprout/tuple/tuple/tuple_decl.hpp  |  9 +-----
 3 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/sprout/index_tuple/index_tuple.hpp b/sprout/index_tuple/index_tuple.hpp
index d92b0d29..b264dfae 100644
--- a/sprout/index_tuple/index_tuple.hpp
+++ b/sprout/index_tuple/index_tuple.hpp
@@ -24,37 +24,33 @@ namespace sprout {
 	template<sprout::uindex_t... Indexes>
 	using uindex_tuple = sprout::integer_sequence<sprout::uindex_t, Indexes...>;
 #else	// #if SPROUT_USE_TEMPLATE_ALIASES && !defined(SPROUT_WORKAROUND_NO_TEMPLATE_ARGUMENT_DEDUCTION_WITH_ALIASES)
+
+	namespace detail {
+		template<typename T, template<T...> class Derived, T... Is>
+		struct integer_sequence_another_base
+			: public sprout::integer_sequence<T, Is...>
+		{
+		public:
+			typedef Derived<Is...> type;
+			template<T... Js>
+			struct rebind
+				: public Derived<Js...>
+			{};
+		public:
+			static SPROUT_CONSTEXPR type make() SPROUT_NOEXCEPT {
+				return type();
+			}
+		};
+	}	// namespace detail
+
 	template<sprout::index_t... Indexes>
 	struct index_tuple
-		: public sprout::integer_sequence<sprout::index_t, Indexes...>
-	{
-	public:
-		typedef index_tuple type;
-		template<sprout::index_t... J>
-		struct rebind
-			: public index_tuple<J...>
-		{};
-	public:
-		static SPROUT_CONSTEXPR type make() SPROUT_NOEXCEPT {
-			return type();
-		}
-	};
-
+		: public sprout::detail::integer_sequence_another_base<sprout::index_t, sprout::index_tuple, Indexes...>
+	{};
 	template<sprout::uindex_t... Indexes>
 	struct uindex_tuple
-		: public sprout::integer_sequence<sprout::uindex_t, Indexes...>
-	{
-	public:
-		typedef uindex_tuple type;
-		template<sprout::uindex_t... J>
-		struct rebind
-			: public uindex_tuple<J...>
-		{};
-	public:
-		static SPROUT_CONSTEXPR type make() SPROUT_NOEXCEPT {
-			return type();
-		}
-	};
+		: public sprout::detail::integer_sequence_another_base<sprout::uindex_t, sprout::uindex_tuple, Indexes...>
+	{};
 #endif	// #if SPROUT_USE_TEMPLATE_ALIASES && !defined(SPROUT_WORKAROUND_NO_TEMPLATE_ARGUMENT_DEDUCTION_WITH_ALIASES)
 }	// namespace sprout
 
diff --git a/sprout/static_assert.hpp b/sprout/static_assert.hpp
index ce7dda9d..040430af 100644
--- a/sprout/static_assert.hpp
+++ b/sprout/static_assert.hpp
@@ -31,8 +31,8 @@
 #	define SPROUT_STATIC_ASSERT(...) \
 		SPROUT_PP_CAT(SPROUT_STATIC_ASSERT_, SPROUT_PP_VARIADIC_SIZE(__VA_ARGS__))(__VA_ARGS__)
 #else
-#	define SPROUT_STATIC_ASSERT(expr) \
-		SPROUT_STATIC_ASSERT_1(expr)
+#	define SPROUT_STATIC_ASSERT(COND) \
+		SPROUT_STATIC_ASSERT_1(COND)
 #endif
 
 //
diff --git a/sprout/tuple/tuple/tuple_decl.hpp b/sprout/tuple/tuple/tuple_decl.hpp
index f14dc9d0..f9d648a7 100644
--- a/sprout/tuple/tuple/tuple_decl.hpp
+++ b/sprout/tuple/tuple/tuple_decl.hpp
@@ -493,14 +493,7 @@ namespace sprout {
 			SPROUT_CXX14_CONSTEXPR tuple& operator=(sprout::pair<UType1, UType2>&& rhs);
 			// tuple swap
 			SPROUT_CXX14_CONSTEXPR void swap(tuple& other)
-			SPROUT_NOEXCEPT_IF(
-				sprout::tpp::all_of_c<
-					SPROUT_NOEXCEPT_EXPR_OR_DEFAULT(
-						sprout::swap(std::declval<Types&>(), std::declval<Types&>()),
-						(sprout::tuples::detail::dummy_integral_constant<Types, bool, false>::value)
-						)...
-				>::value
-				)
+			SPROUT_NOEXCEPT_IF(sprout::tpp::all_of_c<SPROUT_NOEXCEPT_EXPR(sprout::swap(std::declval<Types&>(), std::declval<Types&>()))...>::value)
 			{
 				impl_type::swap(other);
 			}