aboutsummaryrefslogtreecommitdiff
path: root/common/view/basics
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-02-08 14:35:28 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-02-08 14:35:28 +0200
commit903869c797d4365678c928111f818a783fe2bd78 (patch)
tree40d4fb95bdcd130aaea40e87c06c37469c67ec5a /common/view/basics
parentab8d0180ba3dcaa1e143a3cbad7be0ce6a846493 (diff)
Use ODB_DATABASE_* macros in headers compiled by ODB
On Windows DATABASE_* macros are defined by the project, not via a header.
Diffstat (limited to 'common/view/basics')
-rw-r--r--common/view/basics/test.hxx10
1 files changed, 4 insertions, 6 deletions
diff --git a/common/view/basics/test.hxx b/common/view/basics/test.hxx
index 87c4d76..fbe90ee 100644
--- a/common/view/basics/test.hxx
+++ b/common/view/basics/test.hxx
@@ -5,8 +5,6 @@
#ifndef TEST_HXX
#define TEST_HXX
-#include <common/config.hxx> // DATABASE_*
-
#include <string>
#include <vector>
#include <cstddef> // std::size_t
@@ -546,7 +544,7 @@ namespace test2
odb::nullable<int> id2;
};
-#if !defined(DATABASE_SQLITE) && !defined(DATABASE_COMMON)
+#if !defined(ODB_DATABASE_SQLITE) && !defined(ODB_DATABASE_COMMON)
#pragma db view object(obj2 = o2) object(obj1 = o1 right: o2::n == o1::n)
struct vright
@@ -557,9 +555,9 @@ namespace test2
#endif
-#if !defined(DATABASE_MYSQL) && \
- !defined(DATABASE_SQLITE) && \
- !defined(DATABASE_COMMON)
+#if !defined(ODB_DATABASE_MYSQL) && \
+ !defined(ODB_DATABASE_SQLITE) && \
+ !defined(ODB_DATABASE_COMMON)
#pragma db view object(obj1 = o1) object(obj2 = o2 full: o1::n == o2::n)
struct vfull