diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-09-04 21:06:23 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2006-09-04 21:06:23 +0000 |
| commit | 75068e7d753cf6cbe45a4bf294000dca9bd41d8b (patch) | |
| tree | c6274cc10caab08349b5585206034f41ca4a575f /src/libstore/pathlocks.hh | |
| parent | aab88127321344d5818d823bff515d127108d058 (diff) | |
* Use a proper namespace.
* Optimise header file usage a bit.
* Compile the parser as C++.
Diffstat (limited to 'src/libstore/pathlocks.hh')
| -rw-r--r-- | src/libstore/pathlocks.hh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libstore/pathlocks.hh b/src/libstore/pathlocks.hh index 911fe4579..87bb7bf3e 100644 --- a/src/libstore/pathlocks.hh +++ b/src/libstore/pathlocks.hh @@ -1,7 +1,10 @@ #ifndef __PATHLOCKS_H #define __PATHLOCKS_H -#include "util.hh" +#include "types.hh" + + +namespace nix { /* Open (possibly create) a lock file and return the file descriptor. @@ -22,7 +25,7 @@ bool lockFile(int fd, LockType lockType, bool wait); class PathLocks { private: - typedef pair<int, Path> FDPair; + typedef std::pair<int, Path> FDPair; list<FDPair> fds; bool deletePaths; @@ -37,4 +40,7 @@ public: }; +} + + #endif /* !__PATHLOCKS_H */ |