Factor out bind struct to sqlite-types.hxx

2 files changed, 44 insertions, 22 deletions

diff --git a/odb/sqlite/binding.hxx b/odb/sqlite/binding.hxx
index 70edd28..426195b 100644
--- a/odb/sqlite/binding.hxx
+++ b/odb/sqlite/binding.hxx
@@ -12,33 +12,13 @@
 
 #include <odb/forward.hxx>
 
+#include <odb/sqlite/sqlite-types.hxx>
 #include <odb/sqlite/details/export.hxx>
 
 namespace odb
 {
   namespace sqlite
   {
-    // The SQLite parameter/result binding. This data structures is
-    // modelled after MYSQL_BIND from MySQL.
-    //
-    struct bind
-    {
-      enum buffer_type
-      {
-        integer, // Buffer is long long; size, capacity, truncated are unused.
-        real,    // Buffer is double; size, capacity, truncated are unused.
-        text,    // Buffer is a char array.
-        blob     // Buffer is a char array.
-      };
-
-      buffer_type type;
-      void* buffer;
-      std::size_t* size;
-      std::size_t capacity;
-      bool* is_null;
-      bool* truncated;
-    };
-
     class LIBODB_SQLITE_EXPORT binding
     {
     public:
@@ -51,7 +31,7 @@ namespace odb
 
       bind_type* bind;
       std::size_t count;
-      std::size_t version;
+      std::size_t version; // @@ Don't really need it (gen code).
 
     private:
       binding (const binding&);
diff --git a/odb/sqlite/sqlite-types.hxx b/odb/sqlite/sqlite-types.hxx
new file mode 100644
index 0000000..b0bcde4
--- /dev/null
+++ b/odb/sqlite/sqlite-types.hxx
@@ -0,0 +1,42 @@
+// file      : odb/sqlite/sqlite-types.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_SQLITE_SQLITE_TYPES_HXX
+#define ODB_SQLITE_SQLITE_TYPES_HXX
+
+#include <odb/pre.hxx>
+
+#include <cstddef>  // std::size_t
+
+namespace odb
+{
+  namespace sqlite
+  {
+    // The SQLite parameter/result binding. This data structures is modelled
+    // after MYSQL_BIND from MySQL.
+    //
+    struct bind
+    {
+      enum buffer_type
+      {
+        integer, // Buffer is long long; size, capacity, truncated are unused.
+        real,    // Buffer is double; size, capacity, truncated are unused.
+        text,    // Buffer is a char array.
+        blob     // Buffer is a char array.
+      };
+
+      buffer_type type;
+      void* buffer;
+      std::size_t* size;
+      std::size_t capacity;
+      bool* is_null;
+      bool* truncated;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_SQLITE_SQLITE_TYPES_HXX