From 78d2d9e67a881172a0e888b431fcec215e273cb2 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Tue, 11 Mar 2014 18:46:53 +0100
Subject: [PATCH] Renamed tvin_wrap to maybe_tvin

Easier to read
---
 include/sqlpp11/tvin.h              | 32 ++++++++++++++---------------
 include/sqlpp11/vendor/expression.h |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/sqlpp11/tvin.h b/include/sqlpp11/tvin.h
index cf6cbfa5..8cb96623 100644
--- a/include/sqlpp11/tvin.h
+++ b/include/sqlpp11/tvin.h
@@ -74,7 +74,7 @@ namespace sqlpp
 	}
 
 	template<typename T>
-		struct tvin_wrap_t
+		struct maybe_tvin_t
 		{
 			using _table_set = typename T::_table_set;
 			static constexpr bool _is_trivial()
@@ -82,20 +82,20 @@ namespace sqlpp
 				return false;
 			}
 
-			tvin_wrap_t(T t): 
+			maybe_tvin_t(T t): 
 				_value(t)
 			{}
-			tvin_wrap_t(const tvin_wrap_t&) = default;
-			tvin_wrap_t(tvin_wrap_t&&) = default;
-			tvin_wrap_t& operator=(const tvin_wrap_t&) = default;
-			tvin_wrap_t& operator=(tvin_wrap_t&&) = default;
-			~tvin_wrap_t() = default;
+			maybe_tvin_t(const maybe_tvin_t&) = default;
+			maybe_tvin_t(maybe_tvin_t&&) = default;
+			maybe_tvin_t& operator=(const maybe_tvin_t&) = default;
+			maybe_tvin_t& operator=(maybe_tvin_t&&) = default;
+			~maybe_tvin_t() = default;
 
 			T _value;
 		};
 
 	template<typename T>
-		struct tvin_wrap_t<tvin_t<T>>
+		struct maybe_tvin_t<tvin_t<T>>
 		{
 			using _table_set = typename T::_table_set;
 			bool _is_trivial() const
@@ -103,14 +103,14 @@ namespace sqlpp
 				return _value._is_trivial();
 			};
 
-			tvin_wrap_t(tvin_t<T> t): 
+			maybe_tvin_t(tvin_t<T> t): 
 				_value(t._value)
 			{}
-			tvin_wrap_t(const tvin_wrap_t&) = default;
-			tvin_wrap_t(tvin_wrap_t&&) = default;
-			tvin_wrap_t& operator=(const tvin_wrap_t&) = default;
-			tvin_wrap_t& operator=(tvin_wrap_t&&) = default;
-			~tvin_wrap_t() = default;
+			maybe_tvin_t(const maybe_tvin_t&) = default;
+			maybe_tvin_t(maybe_tvin_t&&) = default;
+			maybe_tvin_t& operator=(const maybe_tvin_t&) = default;
+			maybe_tvin_t& operator=(maybe_tvin_t&&) = default;
+			~maybe_tvin_t() = default;
 
 			typename tvin_t<T>::_operand_t _value;
 		};
@@ -118,9 +118,9 @@ namespace sqlpp
 	namespace vendor
 	{
 		template<typename Context, typename Operand>
-			struct serializer_t<Context, tvin_wrap_t<Operand>>
+			struct serializer_t<Context, maybe_tvin_t<Operand>>
 			{
-				using T = tvin_wrap_t<Operand>;
+				using T = maybe_tvin_t<Operand>;
 
 				static Context& _(const T& t, Context& context)
 				{
diff --git a/include/sqlpp11/vendor/expression.h b/include/sqlpp11/vendor/expression.h
index 77f155be..9d2a8868 100644
--- a/include/sqlpp11/vendor/expression.h
+++ b/include/sqlpp11/vendor/expression.h
@@ -58,7 +58,7 @@ namespace sqlpp
 			~binary_expression_t() = default;
 
 			Lhs _lhs;
-			tvin_wrap_t<Rhs> _rhs;
+			maybe_tvin_t<Rhs> _rhs;
 		};
 
 		template<typename Context, typename Lhs, typename Rhs>
@@ -103,7 +103,7 @@ namespace sqlpp
 			~binary_expression_t() = default;
 
 			Lhs _lhs;
-			tvin_wrap_t<Rhs> _rhs;
+			maybe_tvin_t<Rhs> _rhs;
 		};
 
 		template<typename Context, typename Lhs, typename Rhs>