Default copy assignement in Tensor for non-Intel compilers

diff --git a/include/deal.II/base/tensor.h b/include/deal.II/base/tensor.h
index 03c1591688c587b51b27809f2586a50330e860f4..7efa87812084d37d4b4f72ef4877b420c7cdb427 100644 (file)
--- 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 <int dim, typename Number>
 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 <int dim, typename Number>