aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-01-17 16:43:20 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-01-20 15:45:47 +0200
commit151e92a20374d9259d8a0686916293749740ed88 (patch)
tree78323061095d244ad8e2ea4f96bcf7b0371f1f27
parent8a7ade2e937145398156380a31c0f0574b5b7b1a (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).
-rw-r--r--libcommon/common/common.cxx12
-rw-r--r--libcommon/common/common.hxx17
-rw-r--r--libcommon/common/common.txx26
3 files changed, 41 insertions, 14 deletions
diff --git a/libcommon/common/common.cxx b/libcommon/common/common.cxx
index 66a629f..8be7631 100644
--- a/libcommon/common/common.cxx
+++ b/libcommon/common/common.cxx
@@ -141,3 +141,15 @@ create_database (int& argc,
return db;
}
+
+bool
+size_available ()
+{
+#if defined(DATABASE_SQLITE) || \
+ defined(DATABASE_ORACLE) || \
+ defined(DATABASE_MSSQL)
+ return false;
+#else
+ return true;
+#endif
+}
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
diff --git a/libcommon/common/common.txx b/libcommon/common/common.txx
new file mode 100644
index 0000000..ef1461e
--- /dev/null
+++ b/libcommon/common/common.txx
@@ -0,0 +1,26 @@
+// file : libcommon/common/common.txx
+// author : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license : GNU GPL v2; see accompanying LICENSE file
+
+// We have to use this helper function instead of just checking which
+// database is used because the DATABASE_* macro may not be defined
+// in a project that includes this header.
+//
+LIBCOMMON_EXPORT bool
+size_available ();
+
+template <typename T>
+std::size_t
+size (odb::result<T>& r)
+{
+ if (size_available ())
+ return r.size ();
+ else
+ {
+ std::size_t n (0);
+ for (typename odb::result<T>::iterator i (r.begin ()); i != r.end (); ++i)
+ n++;
+ return n;
+ }
+}