From 77d737b401158350a918985bf729710a15ecbf6f Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Sat, 22 Nov 2014 21:41:43 +0100
Subject: [PATCH] Minor cleanup in type_sets

---
 include/sqlpp11/detail/type_set.h | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/sqlpp11/detail/type_set.h b/include/sqlpp11/detail/type_set.h
index a9cc7494..3b4d48d6 100644
--- a/include/sqlpp11/detail/type_set.h
+++ b/include/sqlpp11/detail/type_set.h
@@ -39,6 +39,9 @@ namespace sqlpp
 		template<typename... T>
 			struct make_type_set;
 
+		template<typename... T>
+			using make_type_set_t = typename make_type_set<T...>::type;
+
 		template<typename E, typename SET>
 			struct is_element_of;
 
@@ -49,7 +52,7 @@ namespace sqlpp
 			using size = std::integral_constant<size_t, sizeof...(Elements)>;
 			using _is_type_set = std::true_type;
 
-			static_assert(std::is_same<type_set, typename make_type_set<Elements...>::type>::value, "use make_type_set to construct a set");
+			static_assert(std::is_same<type_set, make_type_set_t<Elements...>>::value, "use make_type_set to construct a typeset");
 
 			template<typename T>
 				struct insert
@@ -90,7 +93,7 @@ namespace sqlpp
 		template<typename... LElements, typename... RElements>
 			struct joined_set<type_set<LElements...>, type_set<RElements...>>
 			{
-				using type = typename make_type_set<LElements..., RElements...>::type;
+				using type = make_type_set_t<LElements..., RElements...>;
 			};
 
 		template<typename L, typename R>
@@ -138,9 +141,6 @@ namespace sqlpp
 				using type = typename make_type_set<Rest...>::type::template insert<T>::type;
 			};
 
-		template<typename... T>
-			using make_type_set_t = typename make_type_set<T...>::type;
-
 		template<template<typename> class Predicate, typename... T>
 			struct make_type_set_if;
 
@@ -167,8 +167,11 @@ namespace sqlpp
 				using type = typename make_type_set_if<InversePredicate, T...>::type;
 			};
 
+		template<template<typename> class Predicate, typename... T>
+			using make_type_set_if_not_t = typename make_type_set_if_not<Predicate, T...>::type;
+
 		template<typename... T>
-			using has_duplicates = std::integral_constant<bool, make_type_set<T...>::type::size::value != sizeof...(T)>;
+			using has_duplicates = std::integral_constant<bool, make_type_set_t<T...>::size::value != sizeof...(T)>;
 
 		template<typename... T>
 			struct make_joined_set
@@ -204,7 +207,7 @@ namespace sqlpp
 			{
 				template<typename E>
 					using is_subtrahend = is_element_of<E, type_set<Subtrahends...>>;
-				using type = typename make_type_set_if_not<is_subtrahend, Minuends...>::type;
+				using type = make_type_set_if_not_t<is_subtrahend, Minuends...>;
 			};
 
 		template<typename Minuend, typename Subtrahend>
@@ -221,7 +224,7 @@ namespace sqlpp
 			{
 				template<typename E>
 					using is_in_both = all_t<is_element_of<E, type_set<LhsElements...>>::value, is_element_of<E, type_set<RhsElements...>>::value>;
-				using type = typename make_type_set_if<is_in_both, LhsElements...>::type;
+				using type = make_type_set_if_t<is_in_both, LhsElements...>;
 			};
 
 		template<typename Lhs, typename Rhs>
@@ -237,7 +240,7 @@ namespace sqlpp
 		template<template<typename> class Transformation, typename... E>
 			struct transform_set<Transformation, type_set<E...>>
 			{
-				using type = typename make_type_set<Transformation<E>...>::type;
+				using type = make_type_set_t<Transformation<E>...>;
 			};
 
 		template<template<typename> class Transformation, typename T>