From a514e6bf5eef80cde3e280b8b59f4568ac52d91b Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Wed, 27 Aug 2014 20:26:01 +0200
Subject: [PATCH] Minor cleanup

---
 include/sqlpp11/insert_value.h |  2 +-
 include/sqlpp11/limit.h        |  8 ++++----
 include/sqlpp11/offset.h       | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/sqlpp11/insert_value.h b/include/sqlpp11/insert_value.h
index 03c28895..899db8bc 100644
--- a/include/sqlpp11/insert_value.h
+++ b/include/sqlpp11/insert_value.h
@@ -62,7 +62,7 @@ namespace sqlpp
 			using _column_t = Column;
 			static constexpr bool _trivial_value_is_null = trivial_value_is_null_t<Column>::value;
 			using _pure_value_t = typename value_type_of<Column>::_cpp_value_type;
-			using _wrapped_value_t = typename wrap_operand<_pure_value_t>::type;
+			using _wrapped_value_t = wrap_operand_t<_pure_value_t>;
 			using _tvin_t = tvin_t<_wrapped_value_t>;
 
 			insert_value_t(rhs_wrap_t<_wrapped_value_t, _trivial_value_is_null> rhs):
diff --git a/include/sqlpp11/limit.h b/include/sqlpp11/limit.h
index f0297c66..375285ec 100644
--- a/include/sqlpp11/limit.h
+++ b/include/sqlpp11/limit.h
@@ -105,7 +105,7 @@ namespace sqlpp
 			template<typename Limit>
 				dynamic_limit_data_t(Limit value):
 					_initialized(true),
-					_value(typename wrap_operand<Limit>::type(value))
+					_value(wrap_operand_t<Limit>(value))
 			{
 			}
 
@@ -137,7 +137,7 @@ namespace sqlpp
 						void set(Limit value)
 						{
 							// FIXME: Make sure that Limit does not require external tables? Need to read up on SQL
-							using arg_t = typename wrap_operand<Limit>::type;
+							using arg_t = wrap_operand_t<Limit>;
 							_data._value = arg_t{value};
 							_data._initialized = true;
 						}
@@ -213,9 +213,9 @@ namespace sqlpp
 
 				template<typename Arg>
 					auto limit(Arg arg) const
-					-> _new_statement_t<limit_t<typename wrap_operand<Arg>::type>>
+					-> _new_statement_t<limit_t<wrap_operand_t<Arg>>>
 					{
-						return { static_cast<const derived_statement_t<Policies>&>(*this), limit_data_t<typename wrap_operand<Arg>::type>{{arg}} };
+						return { static_cast<const derived_statement_t<Policies>&>(*this), limit_data_t<wrap_operand_t<Arg>>{{arg}} };
 					}
 
 				auto dynamic_limit() const
diff --git a/include/sqlpp11/offset.h b/include/sqlpp11/offset.h
index 11244218..f230c4b2 100644
--- a/include/sqlpp11/offset.h
+++ b/include/sqlpp11/offset.h
@@ -105,7 +105,7 @@ namespace sqlpp
 			template<typename Offset>
 				dynamic_offset_data_t(Offset value):
 					_initialized(true),
-					_value(typename wrap_operand<Offset>::type(value))
+					_value(wrap_operand_t<Offset>(value))
 			{
 			}
 
@@ -137,7 +137,7 @@ namespace sqlpp
 						void set(Offset value)
 						{
 							// FIXME: Make sure that Offset does not require external tables? Need to read up on SQL
-							using arg_t = typename wrap_operand<Offset>::type;
+							using arg_t = wrap_operand_t<Offset>;
 							_data._value = arg_t{value};
 							_data._initialized = true;
 						}
@@ -171,7 +171,7 @@ namespace sqlpp
 						void set_offset(Offset value)
 						{
 							// FIXME: Make sure that Offset does not require external tables? Need to read up on SQL
-							using arg_t = typename wrap_operand<Offset>::type;
+							using arg_t = wrap_operand_t<Offset>;
 							static_cast<derived_statement_t<Policies>*>(this)->_offset()._value = arg_t{value};
 							static_cast<derived_statement_t<Policies>*>(this)->_offset()._initialized = true;
 						}
@@ -224,9 +224,9 @@ namespace sqlpp
 
 				template<typename Arg>
 					auto offset(Arg arg) const
-					-> _new_statement_t<offset_t<typename wrap_operand<Arg>::type>>
+					-> _new_statement_t<offset_t<wrap_operand_t<Arg>>>
 					{
-						return { static_cast<const derived_statement_t<Policies>&>(*this), offset_data_t<typename wrap_operand<Arg>::type>{{arg}} };
+						return { static_cast<const derived_statement_t<Policies>&>(*this), offset_data_t<wrap_operand_t<Arg>>{{arg}} };
 					}
 
 				auto dynamic_offset() const