Merge branch 'master' of github.com:jedmccaleb/NewCoin into new_pathfinding

This commit is contained in:
JoelKatz
2013-03-22 14:48:15 -07:00
46 changed files with 909 additions and 442 deletions

View File

@@ -36,12 +36,14 @@ class DatabaseCon
protected:
Database* mDatabase;
boost::recursive_mutex mLock;
static int sCount;
public:
DatabaseCon(const std::string& name, const char *initString[], int countInit);
~DatabaseCon();
Database* getDB() { return mDatabase; }
boost::recursive_mutex& getDBLock() { return mLock; }
Database* getDB() { return mDatabase; }
boost::recursive_mutex& getDBLock() { return mLock; }
static int getCount() { return sCount; }
};
class Application