aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-09-09 09:32:43 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-09-09 09:32:43 +0200
commit4aeca5e53256a0a87b73694b5e7d2b5b2412d1d4 (patch)
tree55a8c9723a33dff3b3ee82d27ea71f673dd30c29
parent6e954a227a0238965437c9d0708004e5c097e217 (diff)
Rework MySQL header inclusion
-rw-r--r--odb/mysql/header.cxx2
-rw-r--r--odb/mysql/source.cxx3
2 files changed, 3 insertions, 2 deletions
diff --git a/odb/mysql/header.cxx b/odb/mysql/header.cxx
index baaad86..695f301 100644
--- a/odb/mysql/header.cxx
+++ b/odb/mysql/header.cxx
@@ -411,7 +411,7 @@ namespace mysql
ctx.os << endl
<< "#include <odb/mysql/version.hxx>" << endl
<< "#include <odb/mysql/forward.hxx>" << endl
- << "#include <odb/mysql/mysql.hxx>" << endl
+ << "#include <odb/mysql/mysql-types.hxx>" << endl
<< endl;
if (ctx.options.generate_query ())
diff --git a/odb/mysql/source.cxx b/odb/mysql/source.cxx
index 1a9e6c8..649e47f 100644
--- a/odb/mysql/source.cxx
+++ b/odb/mysql/source.cxx
@@ -1043,7 +1043,8 @@ namespace mysql
ns >> ns_defines >> ns;
ns_defines >> c;
- ctx.os << "#include <odb/mysql/traits.hxx>" << endl
+ ctx.os << "#include <odb/mysql/mysql.hxx>" << endl
+ << "#include <odb/mysql/traits.hxx>" << endl
<< "#include <odb/mysql/database.hxx>" << endl
<< "#include <odb/mysql/transaction.hxx>" << endl
<< "#include <odb/mysql/connection.hxx>" << endl