From: Matthias Maier Date: Sat, 5 May 2018 18:30:31 +0000 (-0500) Subject: Revert "Default copy assignement in Tensor for non-Intel compilers" X-Git-Tag: v9.1.0-rc1~1214^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6481%2Fhead;p=dealii.git Revert "Default copy assignement in Tensor for non-Intel compilers" This reverts commit 171a9d03e87edcf7d455ecde576546777c112b45. --- diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h index 7efa878120..03c1591688 100644 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@ -212,13 +212,7 @@ 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 @@ -819,7 +813,6 @@ 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) @@ -827,7 +820,6 @@ Tensor<0,dim,Number> &Tensor<0,dim,Number>::operator = (const Tensor<0,dim,Numbe value = p.value; return *this; } -#endif template