From a07999f7436802f15fc21bebd083006c9e681638 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 19 Feb 2015 19:18:48 +0100
Subject: Introduced `Branch` and `Else` pair aliases for usage in `Cond` *
 pure _syntax sugar_ to improve readability of `Cond` conditionals

---
 src/conditional/cond.h | 9 +++++++++
 src/function/apply.h   | 9 ++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/conditional/cond.h b/src/conditional/cond.h
index c543449..5f8014f 100644
--- a/src/conditional/cond.h
+++ b/src/conditional/cond.h
@@ -19,6 +19,15 @@ using Cond = Cdr<Eval<
 	detail::find_variadic<detail::cond_predicate, Branches...>
 >>;
 
+template <
+	typename Condition,
+	typename Result
+>
+using Branch = Pair<Condition, Result>;
+
+template <typename Result>
+using Else = Branch<Boolean<true>, Result>;
+
 }
 
 #endif  // TYPEASVALUE_SRC_CONDITIONAL_COND_H_
diff --git a/src/function/apply.h b/src/function/apply.h
index 591fa8a..553ae7f 100644
--- a/src/function/apply.h
+++ b/src/function/apply.h
@@ -18,20 +18,19 @@ template <
 	typename...                 Arguments
 >
 struct Apply : Cond<
-	Pair<
+	Branch<
 		GreaterThan<detail::count_placeholders<Arguments...>, Size<2>>,
 		detail::apply_variadic<Function, Arguments...>
 	>,
-	Pair<
+	Branch<
 		IsEqualValue<detail::count_placeholders<Arguments...>, Size<2>>,
 		detail::apply_pair<Function, Arguments...>
 	>,
-	Pair<
+	Branch<
 		IsEqualValue<detail::count_placeholders<Arguments...>, Size<1>>,
 		detail::apply_single<Function, Arguments...>
 	>,
-	Pair<
-		Boolean<true>,
+	Else<
 		detail::apply_none<Function, Arguments...>
 	>
 > { };
-- 
cgit v1.2.3