From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Fri, 26 Oct 2018 14:09:57 +0000 (+0200)
Subject: Prefer defining aliases instead of importing from base class
X-Git-Tag: v9.1.0-rc1~597^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7386%2Fhead;p=dealii.git

Prefer defining aliases instead of importing from base class
---

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<RangeNumberType>::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<Number>::real_type>::time_type;
 
   /**
@@ -135,7 +135,7 @@ public:
   /**
    * The scalar-valued real type used for representing time.
    */
-  using typename TensorFunction<rank, dim, Number>::time_type;
+  using time_type = typename TensorFunction<rank, dim, Number>::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<rank, dim, Number>::time_type;
+  using time_type =
+    typename ConstantTensorFunction<rank, dim, Number>::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<rank, dim, Number>::gradient_list(
 
 template <int rank, int dim, typename Number>
 ConstantTensorFunction<rank, dim, Number>::ConstantTensorFunction(
-  const Tensor<rank, dim, Number> &                           value,
-  const typename ConstantTensorFunction<rank, dim, Number>::time_type initial_time)
+  const Tensor<rank, dim, Number> &value,
+  const typename ConstantTensorFunction<rank, dim, Number>::time_type
+    initial_time)
   : TensorFunction<rank, dim, Number>(initial_time)
   , _value(value)
 {}