lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Sync with the trunk.

Browse source
This commit is contained in:
Eelco Dolstra 2010-05-20 12:36:03 +00:00
parent 32539e41d5 93cd5a4a13
commit b92a2e5cc2
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/common-opts.cc
View file

@ -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);

2
src/libexpr/eval.cc
View file

@ -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:

2
src/libexpr/eval.hh
View file

@ -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