diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-01-17 16:43:20 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-01-20 15:45:47 +0200 |
| commit | 151e92a20374d9259d8a0686916293749740ed88 (patch) | |
| tree | 78323061095d244ad8e2ea4f96bcf7b0371f1f27 /libcommon/common/common.hxx | |
| parent | 8a7ade2e937145398156380a31c0f0574b5b7b1a (diff) | |
Rewrite size() function to not rely in DATABSE_* macros in header
Those are not defined for some tests (e.g., database-specific tests
built with VC++ project).
Diffstat (limited to 'libcommon/common/common.hxx')
| -rw-r--r-- | libcommon/common/common.hxx | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/libcommon/common/common.hxx b/libcommon/common/common.hxx index 2cf2357..da3737a 100644 --- a/libcommon/common/common.hxx +++ b/libcommon/common/common.hxx @@ -12,7 +12,6 @@ #include <odb/forward.hxx> // odb::database #include <odb/result.hxx> -#include <common/config.hxx> #include <common/export.hxx> // Make sure assert() is not disabled. @@ -32,18 +31,8 @@ create_database (int& argc, // template <typename T> std::size_t -size (odb::result<T>& r) -{ - std::size_t n (0); -#if defined(DATABASE_SQLITE) || \ - defined(DATABASE_ORACLE) || \ - defined(DATABASE_MSSQL) - for (typename odb::result<T>::iterator i (r.begin ()); i != r.end (); ++i) - n++; -#else - n = r.size (); -#endif - return n; -} +size (odb::result<T>&); + +#include <common/common.txx> #endif // LIBCOMMON_COMMON_COMMON_HXX |