From 76ceab6d528756041d6e82d27c729b90b79c6934 Mon Sep 17 00:00:00 2001
From: Daniel Arndt <arndtd@ornl.gov>
Date: Wed, 7 Aug 2019 15:03:38 -0600
Subject: [PATCH] Address more comments

---
 include/deal.II/base/tensor.h     | 12 ++++----
 tests/tensors/constexpr_tensor.cc | 50 ++++++++++++++-----------------
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 49725bfcee..36fca103da 100644
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -1564,7 +1564,7 @@ operator<<(std::ostream &out, const Tensor<0, dim, Number> &p)
  * @relatesalso Tensor<0,dim,Number>
  */
 template <int dim, typename Number, typename Other>
-DEAL_II_CONSTEXPR DEAL_II_CUDA_HOST_DEV DEAL_II_ALWAYS_INLINE
+DEAL_II_CONSTEXPR DEAL_II_CUDA_HOST_DEV inline DEAL_II_ALWAYS_INLINE
   typename ProductType<Other, Number>::type
   operator*(const Other &object, const Tensor<0, dim, Number> &t)
 {
@@ -1584,7 +1584,7 @@ DEAL_II_CONSTEXPR DEAL_II_CUDA_HOST_DEV DEAL_II_ALWAYS_INLINE
  * @relatesalso Tensor<0,dim,Number>
  */
 template <int dim, typename Number, typename Other>
-DEAL_II_CONSTEXPR DEAL_II_CUDA_HOST_DEV DEAL_II_ALWAYS_INLINE
+DEAL_II_CONSTEXPR DEAL_II_CUDA_HOST_DEV inline DEAL_II_ALWAYS_INLINE
   typename ProductType<Number, Other>::type
   operator*(const Tensor<0, dim, Number> &t, const Other &object)
 {
@@ -1708,12 +1708,12 @@ DEAL_II_CONSTEXPR DEAL_II_CUDA_HOST_DEV inline DEAL_II_ALWAYS_INLINE
  * @relatesalso Tensor
  */
 template <int rank, int dim, typename Number, typename OtherNumber>
-DEAL_II_CUDA_HOST_DEV DEAL_II_CONSTEXPR DEAL_II_ALWAYS_INLINE
-                                        Tensor<rank,
+DEAL_II_CUDA_HOST_DEV DEAL_II_CONSTEXPR inline DEAL_II_ALWAYS_INLINE
+                      Tensor<rank,
          dim,
          typename ProductType<typename EnableIfScalar<Number>::type,
                               OtherNumber>::type>
-                                        operator*(const Number &factor, const Tensor<rank, dim, OtherNumber> &t)
+                      operator*(const Number &factor, const Tensor<rank, dim, OtherNumber> &t)
 {
   // simply forward to the operator above
   return t * factor;
@@ -2146,7 +2146,7 @@ template <template <int, int, typename> class TensorT1,
           typename T1,
           typename T2,
           typename T3>
-DEAL_II_CONSTEXPR
+DEAL_II_CONSTEXPR inline DEAL_II_ALWAYS_INLINE
   typename ProductType<T1, typename ProductType<T2, T3>::type>::type
   contract3(const TensorT1<rank_1, dim, T1> &         left,
             const TensorT2<rank_1 + rank_2, dim, T2> &middle,
diff --git a/tests/tensors/constexpr_tensor.cc b/tests/tensors/constexpr_tensor.cc
index 35c96f433c..fc8c59fdac 100644
--- a/tests/tensors/constexpr_tensor.cc
+++ b/tests/tensors/constexpr_tensor.cc
@@ -129,16 +129,16 @@ main()
     Assert(is_same && !is_not_same, ExcInternalError());
   }
   {
-    DEAL_II_CONSTEXPR const double initializer_1[3] = {1., 0., 0.};
-    DEAL_II_CONSTEXPR const Tensor<1, 3> c_1{initializer_1};
-    DEAL_II_CONSTEXPR const double       initializer_2[3] = {0., 1., 0.};
-    DEAL_II_CONSTEXPR const Tensor<1, 3> c_2{initializer_2};
-
-    DEAL_II_CONSTEXPR const auto   c_cross = cross_product_3d(c_1, c_2);
-    DEAL_II_CONSTEXPR const double initializer_ref[3] = {0., 0., 1.};
-    DEAL_II_CONSTEXPR const Tensor<1, 3> ref{initializer_ref};
-    DEAL_II_CONSTEXPR const bool         is_same     = (c_cross == ref);
-    DEAL_II_CONSTEXPR const bool         is_not_same = (c_cross != ref);
+    constexpr double       initializer_1[3] = {1., 0., 0.};
+    constexpr Tensor<1, 3> c_1{initializer_1};
+    constexpr double       initializer_2[3] = {0., 1., 0.};
+    constexpr Tensor<1, 3> c_2{initializer_2};
+
+    DEAL_II_CONSTEXPR const auto c_cross = cross_product_3d(c_1, c_2);
+    constexpr double             initializer_ref[3] = {0., 0., 1.};
+    constexpr Tensor<1, 3>       ref{initializer_ref};
+    DEAL_II_CONSTEXPR const bool is_same     = (c_cross == ref);
+    DEAL_II_CONSTEXPR const bool is_not_same = (c_cross != ref);
     Assert(is_same && !is_not_same, ExcInternalError());
   }
 
@@ -152,27 +152,21 @@ main()
   deallog << "Used memory: " << used_memory << std::endl;
 
   {
-    DEAL_II_CONSTEXPR const double a_init[3][3] = {{1., 0., 0.},
-                                                   {2., 1., 0.},
-                                                   {3., 2., 1.}};
-    DEAL_II_CONSTEXPR const Tensor<2, 3> a{a_init};
-    DEAL_II_CONSTEXPR const auto         inverted       = invert(a);
-    DEAL_II_CONSTEXPR const double       ref_init[3][3] = {{1., 0., 0.},
-                                                     {-2., 1., 0.},
-                                                     {1., -2., 1}};
-    DEAL_II_CONSTEXPR const Tensor<2, 3> ref{ref_init};
+    constexpr double a_init[3][3] = {{1., 0., 0.}, {2., 1., 0.}, {3., 2., 1.}};
+    constexpr Tensor<2, 3>       a{a_init};
+    DEAL_II_CONSTEXPR const auto inverted       = invert(a);
+    constexpr double             ref_init[3][3] = {{1., 0., 0.},
+                                       {-2., 1., 0.},
+                                       {1., -2., 1}};
+    constexpr Tensor<2, 3>       ref{ref_init};
     Assert(inverted == ref, ExcInternalError());
   }
   {
-    DEAL_II_CONSTEXPR const double a_init[3][3] = {{1., 0., 0.},
-                                                   {2., 1., 0.},
-                                                   {3., 2., 1.}};
-    DEAL_II_CONSTEXPR const Tensor<2, 3> a{a_init};
-    DEAL_II_CONSTEXPR const auto         transposed     = transpose(a);
-    DEAL_II_CONSTEXPR const double       ref_init[3][3] = {{1., 2., 3.},
-                                                     {0., 1., 2.},
-                                                     {0., 0., 1}};
-    DEAL_II_CONSTEXPR const Tensor<2, 3> ref{ref_init};
+    constexpr double a_init[3][3] = {{1., 0., 0.}, {2., 1., 0.}, {3., 2., 1.}};
+    constexpr Tensor<2, 3>       a{a_init};
+    DEAL_II_CONSTEXPR const auto transposed = transpose(a);
+    constexpr double ref_init[3][3] = {{1., 2., 3.}, {0., 1., 2.}, {0., 0., 1}};
+    constexpr Tensor<2, 3> ref{ref_init};
     Assert(transposed == ref, ExcInternalError());
     DEAL_II_CONSTEXPR const auto dummy    = scalar_product(a, ref);
     DEAL_II_CONSTEXPR const auto dummy_2  = contract<0, 0>(a, ref);
-- 
2.39.5