From c67f076c75a36877ce142dc43a1ed2292ab8117a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 3 Aug 2010 14:07:00 +0200
Subject: Add version inclusion, other cosmetic changes

---
 odb/mysql/connection-factory.hxx | 1 +
 odb/mysql/connection.hxx         | 1 +
 odb/mysql/database.hxx           | 5 +++--
 odb/mysql/exceptions.hxx         | 2 ++
 odb/mysql/statement.hxx          | 2 ++
 odb/mysql/traits.hxx             | 9 +++++++--
 odb/mysql/transaction-impl.hxx   | 1 +
 odb/mysql/transaction.hxx        | 1 +
 8 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/odb/mysql/connection-factory.hxx b/odb/mysql/connection-factory.hxx
index e316f18..ef86224 100644
--- a/odb/mysql/connection-factory.hxx
+++ b/odb/mysql/connection-factory.hxx
@@ -8,6 +8,7 @@
 
 #include <odb/shared-ptr.hxx>
 
+#include <odb/mysql/version.hxx>
 #include <odb/mysql/forward.hxx>
 #include <odb/mysql/connection.hxx>
 
diff --git a/odb/mysql/connection.hxx b/odb/mysql/connection.hxx
index 9718189..ea94cd0 100644
--- a/odb/mysql/connection.hxx
+++ b/odb/mysql/connection.hxx
@@ -11,6 +11,7 @@
 #include <odb/forward.hxx>
 #include <odb/shared-ptr.hxx>
 
+#include <odb/mysql/version.hxx>
 #include <odb/mysql/statement.hxx>
 
 namespace odb
diff --git a/odb/mysql/database.hxx b/odb/mysql/database.hxx
index 4263baa..fe9ed05 100644
--- a/odb/mysql/database.hxx
+++ b/odb/mysql/database.hxx
@@ -6,14 +6,15 @@
 #ifndef ODB_MYSQL_DATABASE_HXX
 #define ODB_MYSQL_DATABASE_HXX
 
+#include <mysql/mysql.h>
+
 #include <string>
 #include <memory> // std::auto_ptr
 
-#include <mysql/mysql.h>
-
 #include <odb/shared-ptr.hxx>
 #include <odb/database.hxx>
 
+#include <odb/mysql/version.hxx>
 #include <odb/mysql/forward.hxx>
 #include <odb/mysql/connection.hxx>
 #include <odb/mysql/connection-factory.hxx>
diff --git a/odb/mysql/exceptions.hxx b/odb/mysql/exceptions.hxx
index 04e787f..058f28b 100644
--- a/odb/mysql/exceptions.hxx
+++ b/odb/mysql/exceptions.hxx
@@ -12,6 +12,8 @@
 
 #include <odb/exceptions.hxx>
 
+#include <odb/mysql/version.hxx>
+
 namespace odb
 {
   namespace mysql
diff --git a/odb/mysql/statement.hxx b/odb/mysql/statement.hxx
index 4925269..b635975 100644
--- a/odb/mysql/statement.hxx
+++ b/odb/mysql/statement.hxx
@@ -17,6 +17,8 @@
 #include <odb/traits.hxx>
 #include <odb/shared-ptr.hxx>
 
+#include <odb/mysql/version.hxx>
+
 namespace odb
 {
   namespace mysql
diff --git a/odb/mysql/traits.hxx b/odb/mysql/traits.hxx
index 18aeac5..a8c6c09 100644
--- a/odb/mysql/traits.hxx
+++ b/odb/mysql/traits.hxx
@@ -6,24 +6,29 @@
 #ifndef ODB_MYSQL_TRAITS_HXX
 #define ODB_MYSQL_TRAITS_HXX
 
+#include <mysql/mysql.h> // MYSQL_TIME, used in custom specializations.
+
 #include <string>
 #include <cstddef> // std::size_t
 #include <cstring> // std::memcpy
 
 #include <odb/traits.hxx>
 
+#include <odb/mysql/version.hxx>
+
 namespace odb
 {
   namespace mysql
   {
     template <typename T>
-    struct value_traits: odb::value_traits<T>
+    class value_traits: public odb::value_traits<T>
     {
     };
 
     template <>
-    struct value_traits<std::string>
+    class value_traits<std::string>
     {
+    public:
       typedef std::string value_type;
 
       static void
diff --git a/odb/mysql/transaction-impl.hxx b/odb/mysql/transaction-impl.hxx
index 9ac826f..626ea11 100644
--- a/odb/mysql/transaction-impl.hxx
+++ b/odb/mysql/transaction-impl.hxx
@@ -9,6 +9,7 @@
 #include <odb/shared-ptr.hxx>
 #include <odb/transaction.hxx>
 
+#include <odb/mysql/version.hxx>
 #include <odb/mysql/forward.hxx>
 
 namespace odb
diff --git a/odb/mysql/transaction.hxx b/odb/mysql/transaction.hxx
index ebb62b3..3d36d1d 100644
--- a/odb/mysql/transaction.hxx
+++ b/odb/mysql/transaction.hxx
@@ -8,6 +8,7 @@
 
 #include <odb/transaction.hxx>
 
+#include <odb/mysql/version.hxx>
 #include <odb/mysql/forward.hxx>
 
 namespace odb
-- 
cgit v1.1