From 6b1e15d8d8fc99e23ed427b9a6b5043ebbc79fcc Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Thu, 8 Aug 2019 15:24:02 +0200
Subject: [PATCH] [function-or-gridfunction] minor fixes
---
dune/xt/functions/base/function-or-gridfunction.hh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dune/xt/functions/base/function-or-gridfunction.hh b/dune/xt/functions/base/function-or-gridfunction.hh
index d933ca4d2..908bd28ff 100644
--- a/dune/xt/functions/base/function-or-gridfunction.hh
+++ b/dune/xt/functions/base/function-or-gridfunction.hh
@@ -94,7 +94,7 @@ public:
using BaseType::rC;
using typename BaseType::LocalFunctionType;
- FunctionOrGridFunction(const typename FunctionInterface<d, 1, 1, R>::RangeReturnType& value)
+ FunctionOrGridFunction(const R& value)
: storage_(make_product(new FunctionAsGridFunctionWrapper<E, 1, 1, R>(new ConstantFunction<d, 1, 1, R>(value)),
unit_matrix()))
{}
@@ -121,7 +121,7 @@ public:
{}
FunctionOrGridFunction(const GridFunctionInterface<E, 1, 1, R>& func)
- : storage_(make_product(func, std::move(unit_matrix())))
+ : storage_(make_product(new FunctionOrGridFunction<E, 1, 1, R>(func), std::move(unit_matrix())))
{}
FunctionOrGridFunction(GridFunctionInterface<E, 1, 1, R>*&& func_ptr)
--
GitLab