diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-05 21:49:01 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-07-05 21:49:01 +0000 |
| commit | a38ab99d576bb31288edb8a68c9564d962415662 (patch) | |
| tree | 883f2b1fdaaa5e241cd71e1f786c3f2aaf1813ba /src/libexpr/eval.hh | |
| parent | 8313f0e939a99b1f715695c0e798cfb368dfc1f2 (diff) | |
| parent | 14227aeb327798a1446ddde59fc561c3d2e6b7a8 (diff) | |
Merge remote-tracking branch 'upstream/master' into derivation-header-include-order
Diffstat (limited to 'src/libexpr/eval.hh')
| -rw-r--r-- | src/libexpr/eval.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 863365259..0d52a7f63 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -250,7 +250,7 @@ private: friend struct ExprAttrs; friend struct ExprLet; - Expr * parse(const char * text, const Path & path, + Expr * parse(const char * text, FileOrigin origin, const Path & path, const Path & basePath, StaticEnv & staticEnv); public: |