diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-20T12·36+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-20T12·36+0000 |
| commit | b92a2e5cc2c4f6a14ceea75dfd3bcf5f64743b2f (patch) | |
| tree | dc7746f4c6425ed7c51cc76daf24c568f33daa14 | |
| parent | 32539e41d5aac3daef4a02ad47da785cbaa651e2 (diff) | |
| parent | 93cd5a4a13742b48bb1db0cafe36dd90b7abc10d (diff) | |
* Sync with the trunk.
| -rw-r--r-- | src/libexpr/common-opts.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/eval.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/eval.hh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/common-opts.cc b/src/libexpr/common-opts.cc index 5a4856568b4b..9131951e315d 100644 --- a/src/libexpr/common-opts.cc +++ b/src/libexpr/common-opts.cc @@ -23,7 +23,7 @@ bool parseOptionArg(const string & arg, Strings::iterator & i, Value & v(autoArgs[state.symbols.create(name)].value); if (arg == "--arg") - state.mkThunk_( v, parseExprFromString(state, value, absPath("."))); + state.mkThunk_(v, parseExprFromString(state, value, absPath("."))); else mkString(v, value); diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 14e5cab7de60..1ee6c5a7f6aa 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -16,7 +16,7 @@ namespace nix { -std::ostream & operator << (std::ostream & str, Value & v) +std::ostream & operator << (std::ostream & str, const Value & v) { switch (v.type) { case tInt: diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 0f2cb6c1335c..4e0af70ba64b 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -173,7 +173,7 @@ typedef std::map<Path, Path> SrcToStore; struct EvalState; -std::ostream & operator << (std::ostream & str, Value & v); +std::ostream & operator << (std::ostream & str, const Value & v); class EvalState |