From 4e898368fa479e7fa55d4c55aac6e9cd686a7d0d Mon Sep 17 00:00:00 2001
From: sliser <sliser@mail.ru>
Date: Wed, 16 Dec 2015 09:41:01 +0300
Subject: [PATCH] fixed gcc build

---
 include/sqlpp11/extra_tables.h       |  4 ++--
 include/sqlpp11/from.h               |  4 ++--
 include/sqlpp11/group_by.h           |  4 ++--
 include/sqlpp11/having.h             |  4 ++--
 include/sqlpp11/insert_value_list.h  | 33 ++++++++++++++++++----------
 include/sqlpp11/into.h               |  2 +-
 include/sqlpp11/limit.h              |  6 ++---
 include/sqlpp11/offset.h             |  6 ++---
 include/sqlpp11/order_by.h           |  4 ++--
 include/sqlpp11/select_column_list.h |  4 ++--
 include/sqlpp11/select_flag_list.h   |  4 ++--
 include/sqlpp11/single_table.h       |  2 +-
 include/sqlpp11/statement.h          |  2 +-
 include/sqlpp11/union.h              |  4 ++--
 include/sqlpp11/update_list.h        |  4 ++--
 include/sqlpp11/using.h              |  4 ++--
 include/sqlpp11/where.h              |  6 ++---
 include/sqlpp11/with.h               |  4 ++--
 18 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/include/sqlpp11/extra_tables.h b/include/sqlpp11/extra_tables.h
index 245e5aa0..d434c768 100644
--- a/include/sqlpp11/extra_tables.h
+++ b/include/sqlpp11/extra_tables.h
@@ -64,7 +64,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
@@ -112,7 +112,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/from.h b/include/sqlpp11/from.h
index 0b538f18..81aa3b6f 100644
--- a/include/sqlpp11/from.h
+++ b/include/sqlpp11/from.h
@@ -72,7 +72,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Table>
       void add(Table table)
@@ -149,7 +149,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/group_by.h b/include/sqlpp11/group_by.h
index f5b025c6..51410564 100644
--- a/include/sqlpp11/group_by.h
+++ b/include/sqlpp11/group_by.h
@@ -87,7 +87,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 	  
 	  template <typename Expression>
       void add_ntc(Expression expression)
@@ -169,7 +169,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/having.h b/include/sqlpp11/having.h
index ad4824b7..1c83252b 100644
--- a/include/sqlpp11/having.h
+++ b/include/sqlpp11/having.h
@@ -83,7 +83,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Expression>
       void add_ntc(Expression expression)
@@ -165,7 +165,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/insert_value_list.h b/include/sqlpp11/insert_value_list.h
index a37ca91d..dd07a9ff 100644
--- a/include/sqlpp11/insert_value_list.h
+++ b/include/sqlpp11/insert_value_list.h
@@ -79,7 +79,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
@@ -117,7 +117,7 @@ namespace sqlpp
   struct insert_list_data_t
   {
     insert_list_data_t(Assignments... assignments)
-        : _assignments(assignments...), _columns({assignments._lhs}...), _values(assignments._rhs...)
+        : _assignments(assignments...), _columns(assignments._lhs...), _values(assignments._rhs...)
     {
     }
 
@@ -165,16 +165,27 @@ namespace sqlpp
                      assert_insert_set_one_table_t>>;
 
   template <typename... Assignments>
-  struct check_insert_static_set_t :
-      static_combined_check_t<check_insert_set_t<Assignments...>,
+  struct check_insert_static_set
+  {
+	  using type = static_combined_check_t<check_insert_set_t<Assignments...>,
                               static_check_t<sizeof...(Assignments) != 0, assert_insert_static_set_count_args_t>,
                               static_check_t<detail::have_all_required_columns<typename lhs<Assignments>::type...>::value,
-                                             assert_insert_static_set_all_required_t>>{};
+                                             assert_insert_static_set_all_required_t>>;
+  };
+
+  template <typename... Assignments>
+  using check_insert_static_set_t = typename check_insert_static_set<Assignments...>::type;
 
   template <typename Database, typename... Assignments>
-  struct check_insert_dynamic_set_t : static_combined_check_t<
-      static_check_t<not std::is_same<Database, void>::value, assert_insert_dynamic_set_statement_dynamic_t>,
-      check_insert_set_t<Assignments...>>{};
+  struct check_insert_dynamic_set
+  {
+	  using type = static_combined_check_t <
+		  static_check_t<not std::is_same<Database, void>::value, assert_insert_dynamic_set_statement_dynamic_t>,
+		  check_insert_set_t < Assignments... >>;
+  };
+
+  template <typename Database, typename... Assignments>
+  using check_insert_dynamic_set_t = typename check_insert_dynamic_set<Database, Assignments...>::type;
 
   SQLPP_PORTABLE_STATIC_ASSERT(
       assert_no_unknown_tables_in_insert_assignments_t,
@@ -201,7 +212,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Assignment>
       void add_ntc(Assignment assignment)
@@ -320,7 +331,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename... Assignments>
       void add(Assignments... assignments)
@@ -406,7 +417,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/into.h b/include/sqlpp11/into.h
index 6f4e793e..7b41e2a2 100644
--- a/include/sqlpp11/into.h
+++ b/include/sqlpp11/into.h
@@ -72,7 +72,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/limit.h b/include/sqlpp11/limit.h
index b4342195..06ff7707 100644
--- a/include/sqlpp11/limit.h
+++ b/include/sqlpp11/limit.h
@@ -65,7 +65,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
@@ -138,7 +138,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Limit>
       void set(Limit value)
@@ -196,7 +196,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/offset.h b/include/sqlpp11/offset.h
index ba29e8bf..7f6c27d8 100644
--- a/include/sqlpp11/offset.h
+++ b/include/sqlpp11/offset.h
@@ -67,7 +67,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
@@ -140,7 +140,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Offset>
       void set(Offset value)
@@ -210,7 +210,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/order_by.h b/include/sqlpp11/order_by.h
index 9d3f10ea..8b496831 100644
--- a/include/sqlpp11/order_by.h
+++ b/include/sqlpp11/order_by.h
@@ -84,7 +84,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Expression>
       void add_ntc(Expression expression)
@@ -166,7 +166,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/select_column_list.h b/include/sqlpp11/select_column_list.h
index 175496d3..f4f89c4a 100644
--- a/include/sqlpp11/select_column_list.h
+++ b/include/sqlpp11/select_column_list.h
@@ -202,7 +202,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename NamedExpression>
       void add_ntc(NamedExpression namedExpression)
@@ -404,7 +404,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/select_flag_list.h b/include/sqlpp11/select_flag_list.h
index 69efff60..f167ed55 100644
--- a/include/sqlpp11/select_flag_list.h
+++ b/include/sqlpp11/select_flag_list.h
@@ -72,7 +72,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Flag>
       void add_ntc(Flag flag)
@@ -151,7 +151,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/single_table.h b/include/sqlpp11/single_table.h
index af2d3776..c06dcf35 100644
--- a/include/sqlpp11/single_table.h
+++ b/include/sqlpp11/single_table.h
@@ -74,7 +74,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/statement.h b/include/sqlpp11/statement.h
index afe5feea..10beb56e 100644
--- a/include/sqlpp11/statement.h
+++ b/include/sqlpp11/statement.h
@@ -292,7 +292,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{ data } {}
+	  _impl_t(const _data_t &data) : _data(data) {}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/union.h b/include/sqlpp11/union.h
index b8f39490..f155733c 100644
--- a/include/sqlpp11/union.h
+++ b/include/sqlpp11/union.h
@@ -79,7 +79,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
@@ -143,7 +143,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{ data } {}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/update_list.h b/include/sqlpp11/update_list.h
index 929e48cb..e5c41b00 100644
--- a/include/sqlpp11/update_list.h
+++ b/include/sqlpp11/update_list.h
@@ -80,7 +80,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Assignment>
       void add_ntc(Assignment assignment)
@@ -176,7 +176,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/using.h b/include/sqlpp11/using.h
index cc5da093..4dbe001d 100644
--- a/include/sqlpp11/using.h
+++ b/include/sqlpp11/using.h
@@ -70,7 +70,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  template <typename Table>
       void add(Table table)
@@ -143,7 +143,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/where.h b/include/sqlpp11/where.h
index 09ad6330..78e494c1 100644
--- a/include/sqlpp11/where.h
+++ b/include/sqlpp11/where.h
@@ -85,7 +85,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{ data } {}
+	  _impl_t(const _data_t &data) : _data(data) {}
 
 	  template <typename Expression>
       void add_ntc(Expression expression)
@@ -174,7 +174,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
@@ -234,7 +234,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
diff --git a/include/sqlpp11/with.h b/include/sqlpp11/with.h
index 301156d6..35e19468 100644
--- a/include/sqlpp11/with.h
+++ b/include/sqlpp11/with.h
@@ -80,7 +80,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };
@@ -128,7 +128,7 @@ namespace sqlpp
     struct _impl_t
     {
 	  _impl_t() = default;
-	  _impl_t(const _data_t &data) : _data{data}{}
+	  _impl_t(const _data_t &data) : _data(data){}
 
 	  _data_t _data;
     };