* Use a proper namespace.
* Optimise header file usage a bit. * Compile the parser as C++.
This commit is contained in:
parent
aab8812732
commit
75068e7d75
61 changed files with 650 additions and 268 deletions
|
|
@ -1,14 +1,10 @@
|
|||
#ifndef __DB_H
|
||||
#define __DB_H
|
||||
|
||||
#include <string>
|
||||
#include <list>
|
||||
#include "types.hh"
|
||||
|
||||
#include <map>
|
||||
|
||||
#include "util.hh"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
/* Defined externally. */
|
||||
class DbTxn;
|
||||
|
|
@ -16,6 +12,9 @@ class DbEnv;
|
|||
class Db;
|
||||
|
||||
|
||||
namespace nix {
|
||||
|
||||
|
||||
class Database;
|
||||
|
||||
|
||||
|
|
@ -53,7 +52,7 @@ private:
|
|||
DbEnv * env;
|
||||
|
||||
TableId nextId;
|
||||
map<TableId, Db *> tables;
|
||||
std::map<TableId, Db *> tables;
|
||||
|
||||
void requireEnv();
|
||||
|
||||
|
|
@ -99,5 +98,8 @@ public:
|
|||
DbNoPermission(const format & f) : Error(f) { };
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
#endif /* !__DB_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue