From 81309ce58fe2bf6485ec75fb5133c5c64831ff99 Mon Sep 17 00:00:00 2001
From: Roland Bock <rb@theppro.com>
Date: Fri, 15 Nov 2013 10:09:42 +0100
Subject: [PATCH] Minor cleanup

---
 include/sqlpp11/select_expression_list.h |  2 +-
 include/sqlpp11/where.h                  | 15 ++++-----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/include/sqlpp11/select_expression_list.h b/include/sqlpp11/select_expression_list.h
index 27cb1ea7..f39b57c7 100644
--- a/include/sqlpp11/select_expression_list.h
+++ b/include/sqlpp11/select_expression_list.h
@@ -69,7 +69,7 @@ namespace sqlpp
 				void push_back(Expr&& expr)
 				{
 					_dynamic_expression_names.push_back(std::decay<Expr>::type::_name_t::_get_name());
-					_dynamic_expressions.push_back(std::forward<Expr>(expr));
+					_dynamic_expressions.emplace_back(std::forward<Expr>(expr));
 				}
 				void serialize(std::ostream& os, Db& db, bool first) const
 				{
diff --git a/include/sqlpp11/where.h b/include/sqlpp11/where.h
index 0edf896c..6c03f95f 100644
--- a/include/sqlpp11/where.h
+++ b/include/sqlpp11/where.h
@@ -28,12 +28,11 @@
 #define SQLPP_WHERE_H
 
 #include <ostream>
-#include <vector>
 #include <sqlpp11/select_fwd.h>
 #include <sqlpp11/expression.h>
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/detail/set.h>
-#include <sqlpp11/detail/serializable.h>
+#include <sqlpp11/detail/serializable_list.h>
 
 namespace sqlpp
 {
@@ -65,7 +64,7 @@ namespace sqlpp
 			void add(Expr&& expr)
 			{
 				static_assert(is_expression_t<typename std::decay<Expr>::type>::value, "invalid expression argument in where()");
-				_conditions.push_back(std::forward<Expr>(expr));
+				_conditions.emplace_back(std::forward<Expr>(expr));
 			}
 
 		void serialize(std::ostream& os, Db& db) const
@@ -75,16 +74,10 @@ namespace sqlpp
 
 			os << " WHERE ";
 			bool first = true;
-			for (const auto& condition : _conditions)
-			{
-				if (not first)
-					os << " AND ";
-				condition.serialize(os, db);
-				first = false;
-			}
+			_conditions.serialize(os, db, " AND ", true);
 		}
 
-		std::vector<detail::serializable_t<Db>> _conditions;
+		detail::serializable_list<Db> _conditions;
 	};
 
 }