From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Sat, 7 Apr 2018 13:59:34 +0000 (+0200)
Subject: More uses of DEAL_II_ALWAYS_INLINE
X-Git-Tag: v9.0.0-rc1~212^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6195%2Fhead;p=dealii.git

More uses of DEAL_II_ALWAYS_INLINE
---

diff --git a/include/deal.II/base/symmetric_tensor.h b/include/deal.II/base/symmetric_tensor.h
index cc53329c6d..baf634f95e 100644
--- a/include/deal.II/base/symmetric_tensor.h
+++ b/include/deal.II/base/symmetric_tensor.h
@@ -1087,6 +1087,7 @@ namespace internal
   namespace SymmetricTensorImplementation
   {
     template <int dim, typename Number>
+    inline DEAL_II_ALWAYS_INLINE
     dealii::Tensor<2,dim,Number>
     convert_to_tensor (const dealii::SymmetricTensor<2,dim,Number> &s)
     {
@@ -1399,7 +1400,7 @@ namespace internal
 
 
 template <int rank_, int dim, typename Number>
-inline
+inline DEAL_II_ALWAYS_INLINE
 SymmetricTensor<rank_,dim,Number>::
 operator Tensor<rank_,dim,Number> () const
 {
@@ -1432,7 +1433,7 @@ SymmetricTensor<rank_,dim,Number>::operator !=
 
 template <int rank_, int dim, typename Number>
 template <typename OtherNumber>
-inline
+inline DEAL_II_ALWAYS_INLINE
 SymmetricTensor<rank_,dim,Number> &
 SymmetricTensor<rank_,dim,Number>::operator +=
 (const SymmetricTensor<rank_,dim,OtherNumber> &t)
@@ -1445,7 +1446,7 @@ SymmetricTensor<rank_,dim,Number>::operator +=
 
 template <int rank_, int dim, typename Number>
 template <typename OtherNumber>
-inline
+inline DEAL_II_ALWAYS_INLINE
 SymmetricTensor<rank_,dim,Number> &
 SymmetricTensor<rank_,dim,Number>::operator -=
 (const SymmetricTensor<rank_,dim,OtherNumber> &t)
@@ -1458,7 +1459,7 @@ SymmetricTensor<rank_,dim,Number>::operator -=
 
 template <int rank_, int dim, typename Number>
 template <typename OtherNumber>
-inline
+inline DEAL_II_ALWAYS_INLINE
 SymmetricTensor<rank_,dim,Number> &
 SymmetricTensor<rank_,dim,Number>::operator *= (const OtherNumber &d)
 {
@@ -1470,7 +1471,7 @@ SymmetricTensor<rank_,dim,Number>::operator *= (const OtherNumber &d)
 
 template <int rank_, int dim, typename Number>
 template <typename OtherNumber>
-inline
+inline DEAL_II_ALWAYS_INLINE
 SymmetricTensor<rank_,dim,Number> &
 SymmetricTensor<rank_,dim,Number>::operator /= (const OtherNumber &d)
 {
@@ -1481,7 +1482,7 @@ SymmetricTensor<rank_,dim,Number>::operator /= (const OtherNumber &d)
 
 
 template <int rank_, int dim, typename Number>
-inline
+inline DEAL_II_ALWAYS_INLINE
 SymmetricTensor<rank_,dim,Number>
 SymmetricTensor<rank_,dim,Number>::operator - () const
 {
@@ -1493,7 +1494,7 @@ SymmetricTensor<rank_,dim,Number>::operator - () const
 
 
 template <int rank_, int dim, typename Number>
-inline
+inline DEAL_II_ALWAYS_INLINE
 void
 SymmetricTensor<rank_,dim,Number>::clear ()
 {
@@ -1518,7 +1519,7 @@ namespace internal
 {
 
   template <int dim, typename Number, typename OtherNumber = Number>
-  inline
+  inline DEAL_II_ALWAYS_INLINE
   typename SymmetricTensorAccessors::double_contraction_result<2,2,dim,Number,OtherNumber>::type
   perform_double_contraction (const typename SymmetricTensorAccessors::StorageType<2,dim,Number>::base_tensor_type      &data,
                               const typename SymmetricTensorAccessors::StorageType<2,dim,OtherNumber>::base_tensor_type &sdata)
@@ -1631,7 +1632,7 @@ namespace internal
 
 template <int rank_, int dim, typename Number>
 template <typename OtherNumber>
-inline
+inline DEAL_II_ALWAYS_INLINE
 typename internal::SymmetricTensorAccessors::double_contraction_result<rank_,2,dim,Number,OtherNumber>::type
 SymmetricTensor<rank_,dim,Number>::operator * (const SymmetricTensor<2,dim,OtherNumber> &s) const
 {
diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 237c076312..6819b023f3 100644
--- a/include/deal.II/base/tensor.h
+++ b/include/deal.II/base/tensor.h
@@ -1891,7 +1891,7 @@ contract3 (const TensorT1<rank_1, dim, T1>          &left,
  */
 template <int rank_1, int rank_2, int dim,
           typename Number, typename OtherNumber>
-inline
+inline DEAL_II_ALWAYS_INLINE
 Tensor<rank_1 + rank_2, dim, typename ProductType<Number, OtherNumber>::type>
 outer_product(const Tensor<rank_1, dim, Number> &src1,
               const Tensor<rank_2, dim, OtherNumber> &src2)