aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/ProductEvaluators.h
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2015-06-23 14:20:20 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2015-06-23 14:20:20 +0200
commit71523a2e25eb0c12eaaccb9a2f51d5db127e3766 (patch)
tree610455bb029c19bc16f8b8ef94f607a019b61486 /Eigen/src/Core/ProductEvaluators.h
parentd9778f3391749c1d04eda0f7bfb8c3653ed3387a (diff)
Fix a warning with icc
Diffstat (limited to 'Eigen/src/Core/ProductEvaluators.h')
-rwxr-xr-x[-rw-r--r--]Eigen/src/Core/ProductEvaluators.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h
index 2f199bc29..43ba86193 100644..100755
--- a/Eigen/src/Core/ProductEvaluators.h
+++ b/Eigen/src/Core/ProductEvaluators.h
@@ -751,7 +751,6 @@ struct product_evaluator<Product<Lhs, Rhs, ProductKind>, 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<Product<Lhs, Rhs, ProductKind>, ProductTag, DiagonalSha
template<int LoadMode>
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<LoadMode>(row,col, row,
typename internal::conditional<int(StorageOrder)==RowMajor, internal::true_type, internal::false_type>::type());
}
@@ -798,7 +798,6 @@ struct product_evaluator<Product<Lhs, Rhs, ProductKind>, 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;