fabianhjr/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Disambiguate BaseError(Args) constructor

Browse source 
This means that 'throw Error({ ... ErrorInfo ... })' now works.
This commit is contained in:
Eelco Dolstra 2020-06-15 13:50:33 +02:00
parent 7a77762961
commit fd64e4fb96
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval.cc
View file

@ -506,11 +506,10 @@ LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2))
LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2)) LocalNoInlineNoReturn(void throwEvalError(const Pos & pos, const char * s, const string & s2))
{ {
throw EvalError( throw EvalError({
ErrorInfo { .hint = hintfmt(s, s2),
.hint = hintfmt(s, s2), .nixCode = NixCode { .errPos = pos }
.nixCode = NixCode { .errPos = pos } });
});
} }
LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3)) LocalNoInlineNoReturn(void throwEvalError(const char * s, const string & s2, const string & s3))

3
src/libutil/types.hh
View file

@ -1,6 +1,5 @@
#pragma once #pragma once
#include "ref.hh" #include "ref.hh"
#include <list> #include <list>
@ -25,7 +24,6 @@ typedef string Path;
typedef list<Path> Paths; typedef list<Path> Paths;
typedef set<Path> PathSet; typedef set<Path> PathSet;
/* Helper class to run code at startup. */ /* Helper class to run code at startup. */
template<typename T> template<typename T>
struct OnStartup struct OnStartup
@ -33,5 +31,4 @@ struct OnStartup
OnStartup(T && t) { t(); } OnStartup(T && t) { t(); }
}; };
} }