mirror of
https://github.com/NixOS/nix
synced 2025-06-26 15:51:15 +02:00
Merge branch 'master' into debug-merge-master
This commit is contained in:
commit
6e19947993
102 changed files with 2212 additions and 1418 deletions
|
@ -87,11 +87,7 @@ struct ErrPos {
|
|||
origin = pos.origin;
|
||||
line = pos.line;
|
||||
column = pos.column;
|
||||
// is file symbol null?
|
||||
if (pos.file.set())
|
||||
file = pos.file;
|
||||
else
|
||||
file = "";
|
||||
file = pos.file;
|
||||
return *this;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue