Adjusted code to work with g++-4.8 as well

This commit is contained in:
rbock
2014-06-22 23:37:43 +02:00
parent d90b42f52b
commit 0b27373314
7 changed files with 6 additions and 8 deletions
-2
View File
@@ -60,8 +60,6 @@ namespace sqlpp
using _extra_tables = ::sqlpp::detail::type_set<Tables...>;
};
using _recursive_traits = make_recursive_traits<Tables...>;
// FIXME: extra_tables must not require tables!
static_assert(sizeof...(Tables), "at least one table or join argument required in extra_tables()");
+1 -1
View File
@@ -56,7 +56,7 @@ namespace sqlpp
}
template<typename Db>
auto _run(Db& db) const -> decltype(db.insert(_get_statement()))
auto _run(Db& db) const -> decltype(db.insert(this->_get_statement()))
{
_statement_t::_check_consistency();
+1 -1
View File
@@ -108,7 +108,7 @@ namespace sqlpp
}
template<typename Db>
auto _run(Db& db) const -> decltype(db.insert(_get_statement()))
auto _run(Db& db) const -> decltype(db.insert(this->_get_statement()))
{
_statement_t::_check_consistency();
+1 -1
View File
@@ -57,7 +57,7 @@ namespace sqlpp
}
template<typename Db>
auto _run(Db& db) const -> decltype(db.remove(_get_statement()))
auto _run(Db& db) const -> decltype(db.remove(this->_get_statement()))
{
_statement_t::_check_consistency();
+1 -1
View File
@@ -284,7 +284,7 @@ namespace sqlpp
// Execute
template<typename Db>
auto _run(Db& db) const
-> result_t<decltype(db.select(_get_statement())), _result_row_t<Db>>
-> result_t<decltype(db.select(this->_get_statement())), _result_row_t<Db>>
{
_statement_t::_check_consistency();
static_assert(_statement_t::_get_static_no_of_parameters() == 0, "cannot run select directly with parameters, use prepare instead");
+1 -1
View File
@@ -110,7 +110,7 @@ namespace sqlpp
struct _recursive_traits
{
using _required_tables = _required_tables;
using _required_tables = statement_policies_t::_required_tables;
using _provided_tables = detail::type_set<>;
using _extra_tables = detail::type_set<>;
using _parameters = detail::make_parameter_tuple_t<parameters_of<Policies>...>;
+1 -1
View File
@@ -57,7 +57,7 @@ namespace sqlpp
}
template<typename Db>
auto _run(Db& db) const -> decltype(db.update(_get_statement()))
auto _run(Db& db) const -> decltype(db.update(this->_get_statement()))
{
_statement_t::_check_consistency();