diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26T19·14-0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-07-26T19·14-0400 |
| commit | 8c7910083976e255300efa797030448f5a1cb864 (patch) | |
| tree | afbd7a37d0724feb408a2d025364ed3938b5673a /src/libexpr/eval-inline.hh | |
| parent | aa115e22df1c80e8878237a9e704d7d70783a243 (diff) | |
| parent | 3a4623afbbc1bff85bde33167d36e8c5a4a3df0d (diff) | |
Merge branch 'master' into no-manifests
Diffstat (limited to 'src/libexpr/eval-inline.hh')
| -rw-r--r-- | src/libexpr/eval-inline.hh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libexpr/eval-inline.hh b/src/libexpr/eval-inline.hh index 6026a7d11015..57a9e4c63c21 100644 --- a/src/libexpr/eval-inline.hh +++ b/src/libexpr/eval-inline.hh @@ -1,5 +1,4 @@ -#ifndef __EVAL_INLINE_H -#define __EVAL_INLINE_H +#pragma once #include "eval.hh" @@ -8,7 +7,6 @@ namespace nix { - LocalNoInlineNoReturn(void throwEvalError(const char * s)) { throw EvalError(s); @@ -55,7 +53,4 @@ inline void EvalState::forceList(Value & v) throwTypeError("value is %1% while a list was expected", showType(v)); } - } - -#endif /* !__EVAL_INLINE_H */ |