From 93cd5a4a13742b48bb1db0cafe36dd90b7abc10d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 May 2010 10:36:37 +0000 Subject: [PATCH] * The << operator on values should be const. --- src/libexpr/common-opts.cc | 2 +- src/libexpr/eval.cc | 2 +- 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 5a4856568b..9131951e31 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 14e5cab7de..1ee6c5a7f6 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 852485b05f..65c689a509 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -171,7 +171,7 @@ typedef std::map SrcToStore; struct EvalState; -std::ostream & operator << (std::ostream & str, Value & v); +std::ostream & operator << (std::ostream & str, const Value & v); class EvalState