From 171a9d03e87edcf7d455ecde576546777c112b45 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Fri, 4 May 2018 18:49:55 +0200 Subject: [PATCH] Default copy assignement in Tensor for non-Intel compilers --- include/deal.II/base/tensor.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index 03c1591688..7efa878120 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -212,7 +212,13 @@ public: /** * Assignment from tensors with same underlying scalar type. */ +#ifdef __INTEL_COMPILER Tensor &operator = (const Tensor<0,dim,Number> &rhs); + // ICC 15 doesn't allow this copy constructor to be defaulted. + // see https://github.com/dealii/dealii/pull/5865. +#else + Tensor &operator = (const Tensor<0,dim,Number> &rhs) = default; +#endif /** * This operator assigns a scalar to a tensor. This obviously requires @@ -813,6 +819,7 @@ Tensor<0,dim,Number> &Tensor<0,dim,Number>::operator = (const Tensor<0,dim,Other } +#ifdef __INTEL_COMPILER template inline Tensor<0,dim,Number> &Tensor<0,dim,Number>::operator = (const Tensor<0,dim,Number> &p) @@ -820,6 +827,7 @@ Tensor<0,dim,Number> &Tensor<0,dim,Number>::operator = (const Tensor<0,dim,Numbe value = p.value; return *this; } +#endif template -- 2.39.5