From ef6c7e0c0dee784faccf1d8abe5263f7683ed6e4 Mon Sep 17 00:00:00 2001
From: rbock <rbock@eudoxos.de>
Date: Sat, 14 Jun 2014 07:49:43 +0200
Subject: [PATCH] Removed a few obsolete "typename"

---
 include/sqlpp11/any.h         | 2 +-
 include/sqlpp11/avg.h         | 4 ++--
 include/sqlpp11/count.h       | 4 ++--
 include/sqlpp11/exists.h      | 2 +-
 include/sqlpp11/max.h         | 2 +-
 include/sqlpp11/min.h         | 2 +-
 include/sqlpp11/some.h        | 2 +-
 include/sqlpp11/sum.h         | 4 ++--
 include/sqlpp11/update_list.h | 2 +-
 tests/CMakeLists.txt          | 6 +++---
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/sqlpp11/any.h b/include/sqlpp11/any.h
index c2f6258f..a193b825 100644
--- a/include/sqlpp11/any.h
+++ b/include/sqlpp11/any.h
@@ -78,7 +78,7 @@ namespace sqlpp
 		};
 
 	template<typename T>
-		auto any(T t) -> typename any_t<wrap_operand_t<T>>
+		auto any(T t) -> any_t<wrap_operand_t<T>>
 		{
 			static_assert(is_select_t<wrap_operand_t<T>>::value, "any() requires a select expression as argument");
 			static_assert(is_expression_t<wrap_operand_t<T>>::value, "any() requires a single column select expression as argument");
diff --git a/include/sqlpp11/avg.h b/include/sqlpp11/avg.h
index 46bba2b3..e4470be9 100644
--- a/include/sqlpp11/avg.h
+++ b/include/sqlpp11/avg.h
@@ -86,14 +86,14 @@ namespace sqlpp
 		};
 
 	template<typename T>
-		auto avg(T t) -> typename avg_t<noop, wrap_operand_t<T>>
+		auto avg(T t) -> avg_t<noop, wrap_operand_t<T>>
 		{
 			static_assert(is_numeric_t<wrap_operand_t<T>>::value, "avg() requires a value expression as argument");
 			return { t };
 		}
 
 	template<typename T>
-		auto avg(const sqlpp::distinct_t&, T t) -> typename avg_t<sqlpp::distinct_t, wrap_operand_t<T>>
+		auto avg(const sqlpp::distinct_t&, T t) -> avg_t<sqlpp::distinct_t, wrap_operand_t<T>>
 		{
 			static_assert(is_numeric_t<wrap_operand_t<T>>::value, "avg() requires a value expression as argument");
 			return { t };
diff --git a/include/sqlpp11/count.h b/include/sqlpp11/count.h
index 3e61bb53..af24e47b 100644
--- a/include/sqlpp11/count.h
+++ b/include/sqlpp11/count.h
@@ -87,14 +87,14 @@ namespace sqlpp
 		};
 
 	template<typename T>
-		auto count(T t) -> typename count_t<noop, wrap_operand_t<T>>
+		auto count(T t) -> count_t<noop, wrap_operand_t<T>>
 		{
 			static_assert(is_expression_t<wrap_operand_t<T>>::value, "count() requires an expression as argument");
 			return { t };
 		}
 
 	template<typename T>
-		auto count(const sqlpp::distinct_t&, T t) -> typename count_t<sqlpp::distinct_t, wrap_operand_t<T>>
+		auto count(const sqlpp::distinct_t&, T t) -> count_t<sqlpp::distinct_t, wrap_operand_t<T>>
 		{
 			static_assert(is_expression_t<wrap_operand_t<T>>::value, "count() requires an expression as argument");
 			return { t };
diff --git a/include/sqlpp11/exists.h b/include/sqlpp11/exists.h
index ca993727..54f28208 100644
--- a/include/sqlpp11/exists.h
+++ b/include/sqlpp11/exists.h
@@ -81,7 +81,7 @@ namespace sqlpp
 
 
 	template<typename T>
-		auto exists(T t) -> typename exists_t<wrap_operand_t<T>>
+		auto exists(T t) -> exists_t<wrap_operand_t<T>>
 		{
 			static_assert(is_select_t<wrap_operand_t<T>>::value, "exists() requires a select expression as argument");
 			return { t };
diff --git a/include/sqlpp11/max.h b/include/sqlpp11/max.h
index 46489282..a96dfe4d 100644
--- a/include/sqlpp11/max.h
+++ b/include/sqlpp11/max.h
@@ -80,7 +80,7 @@ namespace sqlpp
 		};
 
 	template<typename T>
-		auto max(T t) -> typename max_t<wrap_operand_t<T>>
+		auto max(T t) -> max_t<wrap_operand_t<T>>
 		{
 			static_assert(is_expression_t<wrap_operand_t<T>>::value, "max() requires a value expression as argument");
 			return { t };
diff --git a/include/sqlpp11/min.h b/include/sqlpp11/min.h
index 0ae1248a..3993bf81 100644
--- a/include/sqlpp11/min.h
+++ b/include/sqlpp11/min.h
@@ -80,7 +80,7 @@ namespace sqlpp
 		};
 
 	template<typename T>
-		auto min(T t) -> typename min_t<wrap_operand_t<T>>
+		auto min(T t) -> min_t<wrap_operand_t<T>>
 		{
 			static_assert(is_expression_t<wrap_operand_t<T>>::value, "min() requires a value expression as argument");
 			return { t };
diff --git a/include/sqlpp11/some.h b/include/sqlpp11/some.h
index 1fb864c8..41519e5e 100644
--- a/include/sqlpp11/some.h
+++ b/include/sqlpp11/some.h
@@ -78,7 +78,7 @@ namespace sqlpp
 		};
 
 	template<typename T>
-		auto some(T t) -> typename some_t<wrap_operand_t<T>>
+		auto some(T t) -> some_t<wrap_operand_t<T>>
 		{
 			static_assert(is_select_t<wrap_operand_t<T>>::value, "some() requires a single column select expression as argument");
 			static_assert(is_expression_t<wrap_operand_t<T>>::value, "some() requires a single column select expression as argument");
diff --git a/include/sqlpp11/sum.h b/include/sqlpp11/sum.h
index d22f008f..89045be9 100644
--- a/include/sqlpp11/sum.h
+++ b/include/sqlpp11/sum.h
@@ -86,14 +86,14 @@ namespace sqlpp
 		};
 
 	template<typename T>
-		auto sum(T t) -> typename sum_t<noop, wrap_operand_t<T>>
+		auto sum(T t) -> sum_t<noop, wrap_operand_t<T>>
 		{
 			static_assert(is_numeric_t<wrap_operand_t<T>>::value, "sum() requires a numeric expression as argument");
 			return { t };
 		}
 
 	template<typename T>
-		auto sum(const sqlpp::distinct_t&, T t) -> typename sum_t<sqlpp::distinct_t, wrap_operand_t<T>>
+		auto sum(const sqlpp::distinct_t&, T t) -> sum_t<sqlpp::distinct_t, wrap_operand_t<T>>
 		{
 			static_assert(is_numeric_t<wrap_operand_t<T>>::value, "sum() requires a numeric expression as argument");
 			return { t };
diff --git a/include/sqlpp11/update_list.h b/include/sqlpp11/update_list.h
index 9b3c9626..e09be547 100644
--- a/include/sqlpp11/update_list.h
+++ b/include/sqlpp11/update_list.h
@@ -49,7 +49,7 @@ namespace sqlpp
 			~update_list_data_t() = default;
 
 			std::tuple<Assignments...> _assignments;
-			typename interpretable_list_t<Database> _dynamic_assignments;
+			interpretable_list_t<Database> _dynamic_assignments;
 		};
 
 	// UPDATE ASSIGNMENTS
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9de5e4e2..9ea24a1f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,9 +8,9 @@ endmacro ()
 
 #build_and_run(InterpretTest)
 build_and_run(InsertTest)
-#build_and_run(RemoveTest)
-#build_and_run(UpdateTest)
-#build_and_run(SelectTest)
+build_and_run(RemoveTest)
+build_and_run(UpdateTest)
+build_and_run(SelectTest)
 #build_and_run(SelectTypeTest)
 #build_and_run(FunctionTest)
 #build_and_run(PreparedTest)