From aa9492dfe8d388d26702fde94976eb2d5cf2e827 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 17 Oct 2013 15:28:18 +0000
Subject: [PATCH] bugfix: it is illegal to use "class" in this context,
"typename" is correct. Strangely enough, newer gccs have no problem with
that, but gcc 4.3 does. Approved by Alex.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11707 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../fluidstates/nonequilibriumenergyfluidstate.hh | 4 ++--
.../material/fluidstates/nonequilibriummassfluidstate.hh | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dumux/material/fluidstates/nonequilibriumenergyfluidstate.hh b/dumux/material/fluidstates/nonequilibriumenergyfluidstate.hh
index 7893b57af1..50eed73aa8 100644
--- a/dumux/material/fluidstates/nonequilibriumenergyfluidstate.hh
+++ b/dumux/material/fluidstates/nonequilibriumenergyfluidstate.hh
@@ -51,8 +51,8 @@ NEW_PROP_TAG(FluidSystem);
*/
template <class TypeTag>
class NonEquilibriumEnergyFluidState :
- public NonEquilibriumFluidState<class GET_PROP_TYPE(TypeTag, Scalar),
- class GET_PROP_TYPE(TypeTag, FluidSystem)>
+ public NonEquilibriumFluidState<typename GET_PROP_TYPE(TypeTag, Scalar),
+ typename GET_PROP_TYPE(TypeTag, FluidSystem)>
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
diff --git a/dumux/material/fluidstates/nonequilibriummassfluidstate.hh b/dumux/material/fluidstates/nonequilibriummassfluidstate.hh
index a9619873cc..988902a374 100644
--- a/dumux/material/fluidstates/nonequilibriummassfluidstate.hh
+++ b/dumux/material/fluidstates/nonequilibriummassfluidstate.hh
@@ -54,12 +54,12 @@ NEW_PROP_TAG(NumComponents);
*/
template <class TypeTag>
class NonEquilibriumMassFluidState :
- public NonEquilibriumFluidState<class GET_PROP_TYPE(TypeTag, Scalar),
- class GET_PROP_TYPE(TypeTag, FluidSystem)>
+ public NonEquilibriumFluidState<typename GET_PROP_TYPE(TypeTag, Scalar),
+ typename GET_PROP_TYPE(TypeTag, FluidSystem)>
{
public:
- typedef NonEquilibriumFluidState<class GET_PROP_TYPE(TypeTag, Scalar),
- class GET_PROP_TYPE(TypeTag, FluidSystem)> ParentType;
+ typedef NonEquilibriumFluidState<typename GET_PROP_TYPE(TypeTag, Scalar),
+ typename GET_PROP_TYPE(TypeTag, FluidSystem)> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
--
GitLab