From 67fee80519c4540d4e867a50612206e1c8900bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Kl=C3=B6fkorn?= <robertk@dune-project.org>
Date: Wed, 1 Dec 2004 10:41:37 +0000
Subject: [PATCH] minor changes.
[[Imported from SVN: r1174]]
---
fem/common/combine.hh | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/fem/common/combine.hh b/fem/common/combine.hh
index 5f34a96e3..72a1d8809 100644
--- a/fem/common/combine.hh
+++ b/fem/common/combine.hh
@@ -7,17 +7,24 @@
#error "PARAM_CLASSNAME must be defined! \n"
#endif
-#include "objpointer.hh"
-
#ifdef PARAM_CLASSNAME
template <class A, class B >
class PARAM_CLASSNAME
+#ifdef PARAM_INHERIT
+ : public PARAM_INHERIT < PARAM_CLASSNAME < A , B > , typename A::Traits::ParamType >
+#undef PARAM_INHERIT
+#else
+ : public ObjPointerStorage
+#endif
{
public:
//! Constructor for combinations with factors
- PARAM_CLASSNAME ( const A & a, const B & b ) : _a ( a ) , _b ( b ) {}
+ PARAM_CLASSNAME ( const A & a, const B & b ) : _a ( a ) , _b ( b )
+ {
+ //std::cout << "Constructor \n";
+ }
#ifdef PARAM_FUNC_1
#define LocalOperatorFunctionToCall PARAM_FUNC_1
--
GitLab