diff --git a/dune/perftool/common/opcounter.hh b/dune/perftool/common/opcounter.hh index 8d80f2bdf6801d285b122ee9fe77b17c5da25a53..7c5760ebdf9d5f11441fc567007030089ed53b62 100644 --- a/dune/perftool/common/opcounter.hh +++ b/dune/perftool/common/opcounter.hh @@ -28,7 +28,7 @@ namespace oc { public: - typedef std::size_t size_type; + using size_type = std::size_t; using value_type = F; diff --git a/dune/perftool/localbasiscache.hh b/dune/perftool/localbasiscache.hh index bf3f9e9853ab79413417fa3584b336f0f7d15519..8d3449105944560ac6dd8058f59b3d34bba38bd0 100644 --- a/dune/perftool/localbasiscache.hh +++ b/dune/perftool/localbasiscache.hh @@ -35,16 +35,16 @@ class CacheReturnProxy template<typename FS> class LocalBasisCacheWithoutReferences { - typedef typename FS::Traits::FiniteElementMap::Traits::FiniteElementType::Traits::LocalBasisType LocalBasisType; - typedef typename Dune::PDELab::LocalBasisCache<LocalBasisType> Cache; - typedef typename LocalBasisType::Traits::DomainFieldType DomainFieldType; - typedef typename LocalBasisType::Traits::DomainType DomainType; - typedef typename LocalBasisType::Traits::RangeType RangeType; - typedef typename LocalBasisType::Traits::JacobianType JacobianType; + using LocalBasisType = typename FS::Traits::FiniteElementMap::Traits::FiniteElementType::Traits::LocalBasisType; + using Cache = typename Dune::PDELab::LocalBasisCache<LocalBasisType>; + using DomainFieldType = typename LocalBasisType::Traits::DomainFieldType; + using DomainType = typename LocalBasisType::Traits::DomainType; + using RangeType = typename LocalBasisType::Traits::RangeType; + using JacobianType = typename LocalBasisType::Traits::JacobianType; public: - typedef CacheReturnProxy<RangeType> FunctionReturnType; - typedef CacheReturnProxy<JacobianType> JacobianReturnType; + using FunctionReturnType = CacheReturnProxy<RangeType>; + using JacobianReturnType = CacheReturnProxy<JacobianType>; FunctionReturnType evaluateFunction(const DomainType& position, const LocalBasisType& localbasis) const { diff --git a/dune/perftool/matrixfree.hh b/dune/perftool/matrixfree.hh index b5bf65ff1faacc89b4a1fd46b17bfec121572ed7..08b7fa89b8151b3683f21530ddd0a03d0b9b8420 100644 --- a/dune/perftool/matrixfree.hh +++ b/dune/perftool/matrixfree.hh @@ -10,7 +10,7 @@ namespace Dune{ template <typename GO, typename V> void solveMatrixFree(GO& go, V& x ){ - typedef Dune::PDELab::OnTheFlyOperator<V,V,GO> ISTLOnTheFlyOperator; + using ISTLOnTheFlyOperator = Dune::PDELab::OnTheFlyOperator<V,V,GO>; ISTLOnTheFlyOperator opb(go); Dune::Richardson<V,V> richardson(1.0); Dune::BiCGSTABSolver<V> solverb(opb,richardson,1E-10,5000,2);