From 8d534f15c12120981e94c59bd9203da840b30cf0 Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Sat, 7 Feb 2015 12:48:14 +0100
Subject: [PATCH] [functions.interfaces] explicitly use types from our base,
not fem
---
dune/stuff/functions/interfaces.hh | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/dune/stuff/functions/interfaces.hh b/dune/stuff/functions/interfaces.hh
index 87ce251c7..e6b832a23 100644
--- a/dune/stuff/functions/interfaces.hh
+++ b/dune/stuff/functions/interfaces.hh
@@ -567,9 +567,15 @@ class GlobalFunctionInterface<EntityImp, DomainFieldImp, domainDim, RangeFieldIm
typedef GlobalFunctionInterface<EntityImp, DomainFieldImp, domainDim, RangeFieldImp, rangeDim, 1> ThisType;
public:
- typedef typename BaseType::LocalfunctionType LocalfunctionType;
- typedef typename BaseType::DomainType DomainType;
- typedef typename BaseType::RangeType RangeType;
+ using typename BaseType::DomainFieldType;
+ using BaseType::dimDomain;
+ using typename BaseType::DomainType;
+ using typename BaseType::RangeFieldType;
+ using BaseType::dimRange;
+ using BaseType::dimRangeCols;
+ using typename BaseType::RangeType;
+ using typename BaseType::LocalfunctionType;
+ using typename BaseType::EntityType;
#if HAVE_DUNE_FEM
typedef typename Dune::Fem::Function<Dune::Fem::FunctionSpace<DomainFieldImp, RangeFieldImp, domainDim, rangeDim>,
GlobalFunctionInterface<EntityImp, DomainFieldImp, domainDim, RangeFieldImp,
--
GitLab