forked from lix-project/lix
* Sync with the trunk.
This commit is contained in:
commit
b92a2e5cc2
|
@ -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);
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue