X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Fdb%2Fsqlite3db%2Fsqlite3db.h;h=f60961b8a93f9a040784b6e2f0b994ae4a0df56f;hb=4e96d123460d6363cf7274e36bd9357768eb86ad;hp=f0aac60bc9463b74e8a6cfdcdf4f1cc645f4f6f3;hpb=5f8a87e41beeda971d6a47a6c6b0555da00af978;p=fms.git

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