From: Daniel Arndt Date: Fri, 9 Feb 2018 11:47:49 +0000 (+0100) Subject: Merge pull request #5865 from QiaoLei-88/make_icc_15_happy X-Git-Tag: v9.0.0-rc1~453 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=881c7a2167d1b3c98d83a5f81a4d3a1550eb4401;p=dealii.git Merge pull request #5865 from QiaoLei-88/make_icc_15_happy avoid icc 15 error on non-const reference --- 881c7a2167d1b3c98d83a5f81a4d3a1550eb4401 diff --cc include/deal.II/base/tensor.h index 7460ca3803,e3bc3d3bc1..26e6656b85 --- a/include/deal.II/base/tensor.h +++ b/include/deal.II/base/tensor.h @@@ -203,8 -203,13 +203,13 @@@ public * Number. */ template - Tensor<0,dim,Number> &operator = (const Tensor<0,dim,OtherNumber> &rhs); + Tensor &operator = (const Tensor<0,dim,OtherNumber> &rhs); + /** + * Assignment from tensors with same underlying scalar type. + */ + Tensor &operator = (const Tensor<0,dim,Number> &rhs); + /** * This operator assigns a scalar to a tensor. This obviously requires * that the @p OtherNumber type is convertible to @p Number.