aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Maudoux <guillaume.maudoux@tweag.io>2022-10-23 00:11:44 +0200
committerGuillaume Maudoux <guillaume.maudoux@tweag.io>2022-10-23 00:11:44 +0200
commit8bd8583bc7a430eeee0f5d5e5cb502158419a500 (patch)
tree6fbec04d702876cd36eb06a172f9359dd8000a91
parent3cd1c3b9888ee4dfee0f0694061e6976949d5245 (diff)
Try to please clang with convoluted templates
-rw-r--r--src/libexpr/eval.cc6
-rw-r--r--src/libexpr/eval.hh6
2 files changed, 5 insertions, 7 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index bd102b186..3b8c0b9c1 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -465,12 +465,6 @@ ErrorBuilder<ErrorType> & ErrorBuilder<ErrorType>::withFrame(const Env & env, co
return *this;
}
-template<class ErrorType>
-void ErrorBuilder<ErrorType>::debugThrow() {
- // NOTE: We always use the -LastTrace version as we push the new trace in withFrame()
- state.debugThrowLastTrace(ErrorType(info));
-}
-
EvalState::EvalState(
const Strings & _searchPath,
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index ff407d090..5e88eb950 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -124,7 +124,11 @@ class ErrorBuilder
ErrorBuilder<ErrorType> & withFrame(const Env & e, const Expr & ex);
[[gnu::noinline, gnu::noreturn]]
- void debugThrow();
+ void ErrorBuilder<ErrorType>::debugThrow() {
+ // NOTE: We always use the -LastTrace version as we push the new trace in withFrame()
+ state.debugThrowLastTrace(ErrorType(info));
+ }
+
};