diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-04 11:44:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-10-04 11:44:47 +0000 |
| commit | 71dfe4b90bec29075f01cfbc45f8f521535bf460 (patch) | |
| tree | 401ac9b86c11b969f97dd4e3b4557b626c638e39 /src/libexpr | |
| parent | e4907411c2d902215d1a18456ce8b0c653650461 (diff) | |
| parent | 450837bcc887a47260817611d01c22e35aba92b6 (diff) | |
* Sync with the trunk.
Diffstat (limited to 'src/libexpr')
| -rw-r--r-- | src/libexpr/eval.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/eval.hh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 96bda43a3..e55f28822 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -39,7 +39,7 @@ std::ostream & operator << (std::ostream & str, const Value & v) str << v.path; // !!! escaping? break; case tNull: - str << "true"; + str << "null"; break; case tAttrs: { str << "{ "; diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 03bf43a3b..c7533479a 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -5,6 +5,7 @@ #include "nixexpr.hh" #include "symbol-table.hh" +#include "hash.hh" typedef union _ATermList * ATermList; @@ -12,7 +13,6 @@ typedef union _ATermList * ATermList; namespace nix { -class Hash; class EvalState; struct Env; struct Value; |