version 0.3.28

[fms.git] / include / db / sqlite3db / sqlite3db.h

diff --git a/include/db/sqlite3db/sqlite3db.h b/include/db/sqlite3db/sqlite3db.h
index 24c4a3a..f60961b 100644 (file)
--- a/include/db/sqlite3db/sqlite3db.h
+++ b/include/db/sqlite3db/sqlite3db.h
@@ -1,21 +1,24 @@
 #ifndef _sqlite3db_\r
 #define _sqlite3db_\r
 \r
-#include <zthread/Singleton.h>\r
-#include <zthread/Mutex.h>\r
+#include <Poco/Mutex.h>\r
 #include <sqlite3.h>\r
 #include <string>\r
-\r
 #include "../sqlite3db.h"\r
+#include "../../threadwrapper/singleton.h"\r
+\r
+#if SQLITE_VERSION_NUMBER<3006006\r
+#error "Your version of SQLite is too old!  3.6.6.2 or later is required."\r
+#endif\r
 \r
 namespace SQLite3DB\r
 {\r
 \r
-class DB:public ZThread::Singleton<DB>\r
+class DB:public Singleton<DB>\r
 {\r
 public:\r
        DB();\r
-       DB(std::string filename);\r
+       DB(const std::string &filename);\r
        ~DB();\r
        \r
        const bool Open(const std::string &filename);\r
@@ -35,7 +38,7 @@ public:
 \r
        sqlite3 *GetDB() { return m_db; }\r
 \r
-       ZThread::Mutex m_mutex;                 // public so that recordset and statment can lock this mutex themselves\r
+       Poco::FastMutex m_mutex;                        // public so that recordset and statment can lock this mutex themselves\r
 \r
 private:\r
        void Initialize();\r