From 75068e7d753cf6cbe45a4bf294000dca9bd41d8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 4 Sep 2006 21:06:23 +0000
Subject: * Use a proper namespace. * Optimise header file usage a bit. *
 Compile the parser as C++.

---
 src/libexpr/eval.hh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/libexpr/eval.hh')

diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index c95a30935..b34e91055 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -4,16 +4,21 @@
 #include <map>
 
 #include "aterm.hh"
-#include "hash.hh"
 #include "nixexpr.hh"
 
 
-typedef map<Path, PathSet> DrvRoots;
-typedef map<Path, Hash> DrvHashes;
+namespace nix {
+
+
+class Hash;
+    
+
+typedef std::map<Path, PathSet> DrvRoots;
+typedef std::map<Path, Hash> DrvHashes;
 
 /* Cache for calls to addToStore(); maps source paths to the store
    paths. */
-typedef map<Path, Path> SrcToStore;
+typedef std::map<Path, Path> SrcToStore;
 
 struct EvalState;
 
@@ -74,5 +79,8 @@ Expr autoCallFunction(Expr e, const ATermMap & args);
 /* Print statistics. */
 void printEvalStats(EvalState & state);
 
+ 
+}
+
 
 #endif /* !__EVAL_H */
-- 
cgit v1.2.3