]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Prefer defining aliases instead of importing from base class 7386/head
authorDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Fri, 26 Oct 2018 14:09:57 +0000 (16:09 +0200)
committerDaniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Fri, 26 Oct 2018 14:09:57 +0000 (16:09 +0200)
include/deal.II/base/function.h
include/deal.II/base/tensor_function.h
include/deal.II/base/tensor_function.templates.h

index d7bd1042ab9b8e54a59148776e894cf73d31ae81..cb57894409595e67beeb9a341c81aeb869f0c168 100644 (file)
@@ -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;
 
   /**
index 2fe1f9c29810756d34c50c3866128ba153a797f0..0de405271766eac55651b975b7910c3f4fcdf6c1 100644 (file)
@@ -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.
index 2b00368aedcfa709ac737de42f095b68558c360d..cb53e448c14d7620ced16e09c27211660798bed5 100644 (file)
@@ -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)
 {}

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.