diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-02-11 16:15:26 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-02-11 16:15:26 +0200 |
commit | 6d0a6fb0566d8270133ecda355f167124686f24f (patch) | |
tree | dd82975b86b97bfa758e08cc2a041d016448d76f | |
parent | 2bbcdaa4165f4613e33fe8462f22086073c9e993 (diff) |
Rearrange inline function order to help MinGW2.4.0
On MinGW, if a DLL-exported inline function is called before it is
known to be inline, the compiler issues a warning.
-rw-r--r-- | odb/mssql/statement.hxx | 16 | ||||
-rw-r--r-- | odb/mssql/statement.ixx | 22 |
2 files changed, 14 insertions, 24 deletions
diff --git a/odb/mssql/statement.hxx b/odb/mssql/statement.hxx index 8798a3c..516ce7b 100644 --- a/odb/mssql/statement.hxx +++ b/odb/mssql/statement.hxx @@ -429,7 +429,13 @@ namespace odb using bulk_statement::result_unknown; unsigned long long - result (std::size_t i); + result (std::size_t i) + { + if (i != i_) + mex_->current (++i_); // mex cannot be NULL since this is a batch. + + return result_; + } unsigned long long execute () @@ -516,7 +522,13 @@ namespace odb using bulk_statement::result_unknown; unsigned long long - result (std::size_t i); + result (std::size_t i) + { + if (i != i_) + mex_->current (++i_); // mex cannot be NULL since this is a batch. + + return result_; + } unsigned long long execute () diff --git a/odb/mssql/statement.ixx b/odb/mssql/statement.ixx index c4f5297..dcaa826 100644 --- a/odb/mssql/statement.ixx +++ b/odb/mssql/statement.ixx @@ -38,27 +38,5 @@ namespace odb if (status_ != 0 && !empty ()) init (skip); } - - // update_statement - // - inline unsigned long long update_statement:: - result (std::size_t i) - { - if (i != i_) - mex_->current (++i_); // mex cannot be NULL since this is a batch. - - return result_; - } - - // delete_statement - // - inline unsigned long long delete_statement:: - result (std::size_t i) - { - if (i != i_) - mex_->current (++i_); // mex cannot be NULL since this is a batch. - - return result_; - } } } |