From 1cd7a029542e8f1b1878d2a4480e19cec85bb17e Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 25 Nov 2022 12:49:26 -0500 Subject: [PATCH] DEAL_II_HOST_DEV_ALWAYS_INLINE implies inline --- include/deal.II/base/tensor.h | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index 7531e840cc..f74ee528ef 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -1035,7 +1035,7 @@ Tensor<0, dim, Number>::end_raw() const template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number>::operator Number &() { // We cannot use Assert inside a CUDA kernel @@ -1063,7 +1063,7 @@ constexpr inline DEAL_II_ALWAYS_INLINE template template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & Tensor<0, dim, Number>::operator=(const Tensor<0, dim, OtherNumber> &p) { value = internal::NumberType::value(p.value); @@ -1073,7 +1073,7 @@ Tensor<0, dim, Number>::operator=(const Tensor<0, dim, OtherNumber> &p) # if defined(__INTEL_COMPILER) || defined(DEAL_II_DELETED_MOVE_CONSTRUCTOR_BUG) template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & Tensor<0, dim, Number>::operator=(const Tensor<0, dim, Number> &p) { value = p.value; @@ -1095,7 +1095,7 @@ Tensor<0, dim, Number>::operator=(Tensor<0, dim, Number> &&other) noexcept template template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & Tensor<0, dim, Number>::operator=(const OtherNumber &d) { value = internal::NumberType::value(d); @@ -1131,7 +1131,7 @@ Tensor<0, dim, Number>::operator!=(const Tensor<0, dim, OtherNumber> &p) const template template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & Tensor<0, dim, Number>::operator+=(const Tensor<0, dim, OtherNumber> &p) { value += p.value; @@ -1141,7 +1141,7 @@ Tensor<0, dim, Number>::operator+=(const Tensor<0, dim, OtherNumber> &p) template template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & Tensor<0, dim, Number>::operator-=(const Tensor<0, dim, OtherNumber> &p) { value -= p.value; @@ -1155,7 +1155,7 @@ namespace internal namespace ComplexWorkaround { template - constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE void + constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE void multiply_assign_scalar(Number &val, const OtherNumber &s) { val *= s; @@ -1163,7 +1163,7 @@ namespace internal # ifdef __CUDA_ARCH__ template - constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE void + constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE void multiply_assign_scalar(std::complex &, const OtherNumber &) { printf("This function is not implemented for std::complex!\n"); @@ -1176,7 +1176,7 @@ namespace internal template template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE Tensor<0, dim, Number> & Tensor<0, dim, Number>::operator*=(const OtherNumber &s) { internal::ComplexWorkaround::multiply_assign_scalar(value, s); @@ -1385,10 +1385,10 @@ namespace internal namespace TensorSubscriptor { template - constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE ArrayElementType & - subscript(ArrayElementType * values, - const unsigned int i, - std::integral_constant) + constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE ArrayElementType & + subscript(ArrayElementType * values, + const unsigned int i, + std::integral_constant) { // We cannot use Assert in a CUDA kernel # ifndef __CUDA_ARCH__ @@ -1398,10 +1398,10 @@ namespace internal } template - constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE ArrayElementType & - subscript(ArrayElementType *dummy, - const unsigned int, - std::integral_constant) + constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE ArrayElementType & + subscript(ArrayElementType *dummy, + const unsigned int, + std::integral_constant) { // We cannot use Assert in a CUDA kernel # ifndef __CUDA_ARCH__ @@ -1417,7 +1417,7 @@ namespace internal template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE typename Tensor::value_type & Tensor::operator[](const unsigned int i) { @@ -1712,7 +1712,7 @@ Tensor::norm() const template -constexpr inline DEAL_II_HOST_DEV_ALWAYS_INLINE +constexpr DEAL_II_HOST_DEV_ALWAYS_INLINE typename numbers::NumberTraits::real_type Tensor::norm_square() const { -- 2.39.5