From a23ffa19f59e3a039c11b7c5128f010ba3c2cce2 Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@wwu.de>
Date: Thu, 25 Aug 2016 16:41:12 +0200
Subject: [PATCH] [stuff-leftovers] fix ExpressionFunction BaseType
---
dune/xt/functions/expression.hh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dune/xt/functions/expression.hh b/dune/xt/functions/expression.hh
index 51bad0063..c6cbdeb18 100644
--- a/dune/xt/functions/expression.hh
+++ b/dune/xt/functions/expression.hh
@@ -40,8 +40,7 @@ template <class EntityImp,
class ExpressionFunction
: public GlobalFunctionInterface<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, rangeDimCols>
{
- typedef LocalizableFunctionInterface<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, rangeDimCols>
- BaseType;
+ typedef GlobalFunctionInterface<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, rangeDimCols> BaseType;
typedef ExpressionFunction<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, rangeDimCols> ThisType;
typedef MathExpressionBase<DomainFieldImp, domainDim, RangeFieldImp, rangeDim * rangeDimCols>
MathExpressionFunctionType;
@@ -225,6 +224,8 @@ public:
return order_;
}
+ using BaseType::evaluate;
+
virtual void evaluate(const DomainType& xx, RangeType& ret) const override
{
evaluate_helper(xx, ret, internal::ChooseVariant<dimRangeCols>());
@@ -269,6 +270,8 @@ public:
#endif // NDEBUG
} // ... evaluate(...)
+ using BaseType::jacobian;
+
virtual void jacobian(const DomainType& xx, JacobianRangeType& ret) const override
{
if (gradients_.size() == 0) {
--
GitLab