From ef816e78bfddd333ef9e4dd4b5bc52f231843b90 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 26 Oct 2018 16:09:57 +0200 Subject: [PATCH] Prefer defining aliases instead of importing from base class --- include/deal.II/base/function.h | 2 +- include/deal.II/base/tensor_function.h | 7 ++++--- include/deal.II/base/tensor_function.templates.h | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/deal.II/base/function.h b/include/deal.II/base/function.h index d7bd1042ab..cb57894409 100644 --- a/include/deal.II/base/function.h +++ b/include/deal.II/base/function.h @@ -164,7 +164,7 @@ public: /** * The scalar-valued real type used for representing time. */ - using typename FunctionTime< + using time_type = typename FunctionTime< typename numbers::NumberTraits::real_type>::time_type; /** diff --git a/include/deal.II/base/tensor_function.h b/include/deal.II/base/tensor_function.h index 2fe1f9c298..0de4052717 100644 --- a/include/deal.II/base/tensor_function.h +++ b/include/deal.II/base/tensor_function.h @@ -72,7 +72,7 @@ public: /** * The scalar-valued real type used for representing time. */ - using typename FunctionTime< + using time_type = typename FunctionTime< typename numbers::NumberTraits::real_type>::time_type; /** @@ -135,7 +135,7 @@ public: /** * The scalar-valued real type used for representing time. */ - using typename TensorFunction::time_type; + using time_type = typename TensorFunction::time_type; /** * Constructor; takes the constant tensor value as an argument. The @@ -188,7 +188,8 @@ public: /** * The scalar-valued real type used for representing time. */ - using typename ConstantTensorFunction::time_type; + using time_type = + typename ConstantTensorFunction::time_type; /** * Constructor. diff --git a/include/deal.II/base/tensor_function.templates.h b/include/deal.II/base/tensor_function.templates.h index 2b00368aed..cb53e448c1 100644 --- a/include/deal.II/base/tensor_function.templates.h +++ b/include/deal.II/base/tensor_function.templates.h @@ -85,8 +85,9 @@ TensorFunction::gradient_list( template ConstantTensorFunction::ConstantTensorFunction( - const Tensor & value, - const typename ConstantTensorFunction::time_type initial_time) + const Tensor &value, + const typename ConstantTensorFunction::time_type + initial_time) : TensorFunction(initial_time) , _value(value) {} -- 2.39.5