projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.3
[fms.git]
/
include
/
db
/
sqlite3db
/
sqlite3db.h
diff --git
a/include/db/sqlite3db/sqlite3db.h
b/include/db/sqlite3db/sqlite3db.h
index
24c4a3a
..
91bdfec
100644
(file)
--- a/
include/db/sqlite3db/sqlite3db.h
+++ b/
include/db/sqlite3db/sqlite3db.h
@@
-1,17
+1,19
@@
#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 <zthread/Singleton.h>
\r
+
//
#include <zthread/Mutex.h>
\r
#include <sqlite3.h>
\r
#include <string>
\r
#include <sqlite3.h>
\r
#include <string>
\r
+#include "../../pthreadwrapper/singleton.h"
\r
+#include "../../pthreadwrapper/mutex.h"
\r
\r
#include "../sqlite3db.h"
\r
\r
namespace SQLite3DB
\r
{
\r
\r
\r
#include "../sqlite3db.h"
\r
\r
namespace SQLite3DB
\r
{
\r
\r
-class DB:public
Z
Thread::Singleton<DB>
\r
+class DB:public
P
Thread::Singleton<DB>
\r
{
\r
public:
\r
DB();
\r
{
\r
public:
\r
DB();
\r
@@
-35,7
+37,7
@@
public:
\r
sqlite3 *GetDB() { return m_db; }
\r
\r
\r
sqlite3 *GetDB() { return m_db; }
\r
\r
-
Z
Thread::Mutex m_mutex; // public so that recordset and statment can lock this mutex themselves
\r
+
P
Thread::Mutex 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