projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.19
[fms.git]
/
include
/
db
/
sqlite3db
/
sqlite3db.h
diff --git
a/include/db/sqlite3db/sqlite3db.h
b/include/db/sqlite3db/sqlite3db.h
index
b41f3b8
..
470ba85
100644
(file)
--- a/
include/db/sqlite3db/sqlite3db.h
+++ b/
include/db/sqlite3db/sqlite3db.h
@@
-1,14
+1,11
@@
#ifndef _sqlite3db_
\r
#define _sqlite3db_
\r
\r
#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
#include <sqlite3.h>
\r
#include <string>
\r
-#include "../../pthreadwrapper/mutex.h"
\r
#include "../sqlite3db.h"
\r
#include "../sqlite3db.h"
\r
-
\r
-#include "../../pthreadwrapper/singleton.h"
\r
+#include "../../threadwrapper/singleton.h"
\r
\r
#if SQLITE_VERSION_NUMBER<3005000
\r
#error "Your version of SQLite is too old! 3.5.0 or later is required."
\r
\r
#if SQLITE_VERSION_NUMBER<3005000
\r
#error "Your version of SQLite is too old! 3.5.0 or later is required."
\r
@@
-17,7
+14,7
@@
namespace SQLite3DB
\r
{
\r
\r
namespace SQLite3DB
\r
{
\r
\r
-class DB:public
PThread::
Singleton<DB>
\r
+class DB:public Singleton<DB>
\r
{
\r
public:
\r
DB();
\r
{
\r
public:
\r
DB();
\r
@@
-41,7
+38,7
@@
public:
\r
sqlite3 *GetDB() { return m_db; }
\r
\r
\r
sqlite3 *GetDB() { return m_db; }
\r
\r
- P
Thread::Mutex m_mutex;
// public so that recordset and statment can lock this mutex themselves
\r
+ P
oco::FastMutex m_mutex;
// public so that recordset and statment can lock this mutex themselves
\r
\r
private:
\r
void Initialize();
\r
\r
private:
\r
void Initialize();
\r