From 006155175a3d134f14abe4768a075d725901c0c7 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Sat, 7 Apr 2018 15:59:34 +0200 Subject: [PATCH] More uses of DEAL_II_ALWAYS_INLINE --- include/deal.II/base/symmetric_tensor.h | 19 ++++++++++--------- include/deal.II/base/tensor.h | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) 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 + 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 -inline +inline DEAL_II_ALWAYS_INLINE SymmetricTensor:: operator Tensor () const { @@ -1432,7 +1433,7 @@ SymmetricTensor::operator != template template -inline +inline DEAL_II_ALWAYS_INLINE SymmetricTensor & SymmetricTensor::operator += (const SymmetricTensor &t) @@ -1445,7 +1446,7 @@ SymmetricTensor::operator += template template -inline +inline DEAL_II_ALWAYS_INLINE SymmetricTensor & SymmetricTensor::operator -= (const SymmetricTensor &t) @@ -1458,7 +1459,7 @@ SymmetricTensor::operator -= template template -inline +inline DEAL_II_ALWAYS_INLINE SymmetricTensor & SymmetricTensor::operator *= (const OtherNumber &d) { @@ -1470,7 +1471,7 @@ SymmetricTensor::operator *= (const OtherNumber &d) template template -inline +inline DEAL_II_ALWAYS_INLINE SymmetricTensor & SymmetricTensor::operator /= (const OtherNumber &d) { @@ -1481,7 +1482,7 @@ SymmetricTensor::operator /= (const OtherNumber &d) template -inline +inline DEAL_II_ALWAYS_INLINE SymmetricTensor SymmetricTensor::operator - () const { @@ -1493,7 +1494,7 @@ SymmetricTensor::operator - () const template -inline +inline DEAL_II_ALWAYS_INLINE void SymmetricTensor::clear () { @@ -1518,7 +1519,7 @@ namespace internal { template - 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 template -inline +inline DEAL_II_ALWAYS_INLINE typename internal::SymmetricTensorAccessors::double_contraction_result::type SymmetricTensor::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 &left, */ template -inline +inline DEAL_II_ALWAYS_INLINE Tensor::type> outer_product(const Tensor &src1, const Tensor &src2) -- 2.39.5