From b0a28bc16378d97db8560ac2e39b6ae52b800eb1 Mon Sep 17 00:00:00 2001 From: Bernd Flemisch Date: Mon, 18 Dec 2017 16:25:46 +0100 Subject: [PATCH] [spatialparams] replace typedef by using (again) --- dumux/material/spatialparams/sequentialfv.hh | 12 ++++++------ dumux/material/spatialparams/sequentialfv1p.hh | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dumux/material/spatialparams/sequentialfv.hh b/dumux/material/spatialparams/sequentialfv.hh index d6e7c6ecf8..fafa8a703b 100644 --- a/dumux/material/spatialparams/sequentialfv.hh +++ b/dumux/material/spatialparams/sequentialfv.hh @@ -42,19 +42,19 @@ namespace Dumux template class SequentialFVSpatialParams: public SequentialFVSpatialParamsOneP { - typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; - typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) Implementation; + using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); + using GridView = typename GET_PROP_TYPE(TypeTag, GridView); + using Implementation = typename GET_PROP_TYPE(TypeTag, SpatialParams); enum { dimWorld = GridView::dimensionworld }; - typedef typename GridView::template Codim<0>::Entity Element; - typedef Dune::FieldVector GlobalPosition; + using Element = typename GridView::template Codim<0>::Entity; + using GlobalPosition = Dune::FieldVector; /// @cond false - typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams; + using MaterialLawParams = typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params; /// @endcond public: diff --git a/dumux/material/spatialparams/sequentialfv1p.hh b/dumux/material/spatialparams/sequentialfv1p.hh index 4af5835a01..211389183c 100644 --- a/dumux/material/spatialparams/sequentialfv1p.hh +++ b/dumux/material/spatialparams/sequentialfv1p.hh @@ -51,9 +51,9 @@ NEW_PROP_TAG(SpatialParams); template class SequentialFVSpatialParamsOneP { - typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; - typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; - typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) Implementation; + using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); + using GridView = typename GET_PROP_TYPE(TypeTag, GridView); + using Implementation = typename GET_PROP_TYPE(TypeTag, SpatialParams); enum { @@ -61,9 +61,9 @@ class SequentialFVSpatialParamsOneP dimWorld = GridView::dimensionworld }; - typedef typename GridView::template Codim<0>::Entity Element; - typedef Dune::FieldVector GlobalPosition; - typedef Dune::FieldMatrix DimWorldMatrix; + using Element = typename GridView::template Codim<0>::Entity; + using GlobalPosition = Dune::FieldVector; + using DimWorldMatrix = Dune::FieldMatrix; public: SequentialFVSpatialParamsOneP(const GridView &gridView) -- GitLab