From 71523a2e25eb0c12eaaccb9a2f51d5db127e3766 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Tue, 23 Jun 2015 14:20:20 +0200 Subject: [PATCH] Fix a warning with icc --- Eigen/src/Core/ProductEvaluators.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) mode change 100644 => 100755 Eigen/src/Core/ProductEvaluators.h diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h old mode 100644 new mode 100755 index 2f199bc29..43ba86193 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -751,7 +751,6 @@ struct product_evaluator, ProductTag, DiagonalSha using Base::m_diagImpl; using Base::m_matImpl; using Base::coeff; - using Base::packet_impl; typedef typename Base::Scalar Scalar; typedef typename Base::PacketScalar PacketScalar; @@ -776,7 +775,8 @@ struct product_evaluator, ProductTag, DiagonalSha template EIGEN_STRONG_INLINE PacketScalar packet(Index row, Index col) const { - // NVCC complains about template keyword, so we disable this function in CUDA mode + // FIXME: NVCC used to complain about the template keyword, but we have to check whether this is still the case. + // See also similar calls below. return this->template packet_impl(row,col, row, typename internal::conditional::type()); } @@ -798,7 +798,6 @@ struct product_evaluator, ProductTag, DenseShape, using Base::m_diagImpl; using Base::m_matImpl; using Base::coeff; - using Base::packet_impl; typedef typename Base::Scalar Scalar; typedef typename Base::PacketScalar PacketScalar;