0
0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-16 04:47:18 +08:00

fixed gcc build

This commit is contained in:
sliser 2015-12-16 09:41:01 +03:00
parent a6f506b57f
commit 4e898368fa
18 changed files with 56 additions and 45 deletions

View File

@ -64,7 +64,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };
@ -112,7 +112,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -72,7 +72,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Table> template <typename Table>
void add(Table table) void add(Table table)
@ -149,7 +149,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -87,7 +87,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Expression> template <typename Expression>
void add_ntc(Expression expression) void add_ntc(Expression expression)
@ -169,7 +169,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -83,7 +83,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Expression> template <typename Expression>
void add_ntc(Expression expression) void add_ntc(Expression expression)
@ -165,7 +165,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -79,7 +79,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };
@ -117,7 +117,7 @@ namespace sqlpp
struct insert_list_data_t struct insert_list_data_t
{ {
insert_list_data_t(Assignments... assignments) 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>>; assert_insert_set_one_table_t>>;
template <typename... Assignments> template <typename... Assignments>
struct check_insert_static_set_t : struct check_insert_static_set
static_combined_check_t<check_insert_set_t<Assignments...>, {
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<sizeof...(Assignments) != 0, assert_insert_static_set_count_args_t>,
static_check_t<detail::have_all_required_columns<typename lhs<Assignments>::type...>::value, 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> template <typename Database, typename... Assignments>
struct check_insert_dynamic_set_t : static_combined_check_t< 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>, static_check_t<not std::is_same<Database, void>::value, assert_insert_dynamic_set_statement_dynamic_t>,
check_insert_set_t<Assignments...>>{}; 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( SQLPP_PORTABLE_STATIC_ASSERT(
assert_no_unknown_tables_in_insert_assignments_t, assert_no_unknown_tables_in_insert_assignments_t,
@ -201,7 +212,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Assignment> template <typename Assignment>
void add_ntc(Assignment assignment) void add_ntc(Assignment assignment)
@ -320,7 +331,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename... Assignments> template <typename... Assignments>
void add(Assignments... assignments) void add(Assignments... assignments)
@ -406,7 +417,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -72,7 +72,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -65,7 +65,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };
@ -138,7 +138,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Limit> template <typename Limit>
void set(Limit value) void set(Limit value)
@ -196,7 +196,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -67,7 +67,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };
@ -140,7 +140,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Offset> template <typename Offset>
void set(Offset value) void set(Offset value)
@ -210,7 +210,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -84,7 +84,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Expression> template <typename Expression>
void add_ntc(Expression expression) void add_ntc(Expression expression)
@ -166,7 +166,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -202,7 +202,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename NamedExpression> template <typename NamedExpression>
void add_ntc(NamedExpression namedExpression) void add_ntc(NamedExpression namedExpression)
@ -404,7 +404,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -72,7 +72,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Flag> template <typename Flag>
void add_ntc(Flag flag) void add_ntc(Flag flag)
@ -151,7 +151,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -74,7 +74,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -292,7 +292,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{ data } {} _impl_t(const _data_t &data) : _data(data) {}
_data_t _data; _data_t _data;
}; };

View File

@ -79,7 +79,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };
@ -143,7 +143,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{ data } {} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -80,7 +80,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Assignment> template <typename Assignment>
void add_ntc(Assignment assignment) void add_ntc(Assignment assignment)
@ -176,7 +176,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -70,7 +70,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
template <typename Table> template <typename Table>
void add(Table table) void add(Table table)
@ -143,7 +143,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -85,7 +85,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{ data } {} _impl_t(const _data_t &data) : _data(data) {}
template <typename Expression> template <typename Expression>
void add_ntc(Expression expression) void add_ntc(Expression expression)
@ -174,7 +174,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };
@ -234,7 +234,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };

View File

@ -80,7 +80,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };
@ -128,7 +128,7 @@ namespace sqlpp
struct _impl_t struct _impl_t
{ {
_impl_t() = default; _impl_t() = default;
_impl_t(const _data_t &data) : _data{data}{} _impl_t(const _data_t &data) : _data(data){}
_data_t _data; _data_t _data;
}; };