From 4be53d9933030d79c6a1931be358dd531cca2d9b Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Mon, 28 Jul 2014 21:36:53 +0200
Subject: [PATCH] Fixed a error in type set intersect calculation and in
 tracking outer tables

---
 include/sqlpp11/detail/type_set.h | 2 +-
 include/sqlpp11/join.h            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/sqlpp11/detail/type_set.h b/include/sqlpp11/detail/type_set.h
index 1e95cc6a..0f85d875 100644
--- a/include/sqlpp11/detail/type_set.h
+++ b/include/sqlpp11/detail/type_set.h
@@ -221,7 +221,7 @@ namespace sqlpp
 			struct make_intersect_set<type_set<LhsElements...>, type_set<RhsElements...>>
 			{
 				template<typename E>
-					using is_in_both = is_element_of<E, make_type_set_t<LhsElements..., RhsElements...>>;
+					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;
 			};
 
diff --git a/include/sqlpp11/join.h b/include/sqlpp11/join.h
index d5ae7b4c..6e90ca37 100644
--- a/include/sqlpp11/join.h
+++ b/include/sqlpp11/join.h
@@ -50,14 +50,14 @@ namespace sqlpp
 	struct left_outer_join_t
 	{
 		template<typename Lhs, typename Rhs>
-			using _provided_outer_tables = detail::make_joined_set_t<provided_outer_tables_of<Lhs>, provided_tables_of<Rhs>>;
+			using _provided_outer_tables = detail::make_joined_set_t<provided_tables_of<Lhs>, provided_outer_tables_of<Rhs>>;
 
 		static constexpr const char* _name = " LEFT OUTER ";
 	};
 	struct right_outer_join_t
 	{
 		template<typename Lhs, typename Rhs>
-			using _provided_outer_tables = detail::make_joined_set_t<provided_tables_of<Lhs>, provided_outer_tables_of<Rhs>>;
+			using _provided_outer_tables = detail::make_joined_set_t<provided_outer_tables_of<Lhs>, provided_tables_of<Rhs>>;
 
 		static constexpr const char* _name = " RIGHT OUTER ";
 	};