From c9f4e1b4a7d43f3f2d2bfdbcb420171287729a32 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Sat, 9 Apr 2016 22:50:18 +0200
Subject: [PATCH] More cleanup

---
 include/sqlpp11/basic_expression_operators.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/sqlpp11/basic_expression_operators.h b/include/sqlpp11/basic_expression_operators.h
index 462ad6a7..9799959a 100644
--- a/include/sqlpp11/basic_expression_operators.h
+++ b/include/sqlpp11/basic_expression_operators.h
@@ -108,8 +108,8 @@ namespace sqlpp
     template <template <typename Lhs, typename Rhs> class NewExpr, typename T>
     struct _new_binary_expression
     {
-      using type =
-          comparison_expression_t<check_comparison_t<Expr, wrap_operand_t<T>>, NewExpr, Expr, wrap_operand_t<T>>;
+      using _check = check_comparison_t<Expr, T>;
+      using type = comparison_expression_t<_check, NewExpr, Expr, wrap_operand_t<T>>;
     };
     template <template <typename Lhs, typename Rhs> class NewExpr, typename T>
     using _new_binary_expression_t = typename _new_binary_expression<NewExpr, T>::type;
@@ -117,7 +117,8 @@ namespace sqlpp
     template <template <typename Lhs, typename... Rhs> class NewExpr, typename... T>
     struct _new_nary_expression
     {
-      using type = in_expression_t<check_in_t<Expr, wrap_operand_t<T>...>, NewExpr, Expr, wrap_operand_t<T>...>;
+      using _check = check_in_t<Expr, T...>;
+      using type = in_expression_t<_check, NewExpr, Expr, wrap_operand_t<T>...>;
     };
 
     template <typename T>