mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-06-04 18:54:00 +08:00
fix compilation of sparse module with ICC
This commit is contained in:
parent
22db1a6e82
commit
162d29e696
@ -279,18 +279,6 @@ class DynamicSparseMatrix
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename OtherDerived>
|
|
||||||
inline DynamicSparseMatrix& operator=(const SparseMatrixBase<OtherDerived>& other)
|
|
||||||
{
|
|
||||||
return SparseMatrixBase<DynamicSparseMatrix>::operator=(other.derived());
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename OtherDerived>
|
|
||||||
EIGEN_STRONG_INLINE DynamicSparseMatrix& operator=(const ReturnByValue<OtherDerived>& func)
|
|
||||||
{
|
|
||||||
return Base::operator=(func);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Destructor */
|
/** Destructor */
|
||||||
inline ~DynamicSparseMatrix() {}
|
inline ~DynamicSparseMatrix() {}
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ class SparseMatrix
|
|||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
EIGEN_SPARSE_PUBLIC_INTERFACE(SparseMatrix)
|
EIGEN_SPARSE_PUBLIC_INTERFACE(SparseMatrix)
|
||||||
using Base::operator=;
|
// using Base::operator=;
|
||||||
EIGEN_SPARSE_INHERIT_ASSIGNMENT_OPERATOR(SparseMatrix, +=)
|
EIGEN_SPARSE_INHERIT_ASSIGNMENT_OPERATOR(SparseMatrix, +=)
|
||||||
EIGEN_SPARSE_INHERIT_ASSIGNMENT_OPERATOR(SparseMatrix, -=)
|
EIGEN_SPARSE_INHERIT_ASSIGNMENT_OPERATOR(SparseMatrix, -=)
|
||||||
// FIXME: why are these operator already alvailable ???
|
// FIXME: why are these operator already alvailable ???
|
||||||
@ -466,15 +466,15 @@ class SparseMatrix
|
|||||||
#ifndef EIGEN_PARSED_BY_DOXYGEN
|
#ifndef EIGEN_PARSED_BY_DOXYGEN
|
||||||
template<typename Lhs, typename Rhs>
|
template<typename Lhs, typename Rhs>
|
||||||
inline SparseMatrix& operator=(const SparseSparseProduct<Lhs,Rhs>& product)
|
inline SparseMatrix& operator=(const SparseSparseProduct<Lhs,Rhs>& product)
|
||||||
{
|
{ return Base::operator=(product); }
|
||||||
return Base::operator=(product);
|
|
||||||
}
|
|
||||||
|
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
EIGEN_STRONG_INLINE SparseMatrix& operator=(const ReturnByValue<OtherDerived>& func)
|
inline SparseMatrix& operator=(const ReturnByValue<OtherDerived>& other)
|
||||||
{
|
{ return Base::operator=(other); }
|
||||||
return Base::operator=(func);
|
|
||||||
}
|
template<typename OtherDerived>
|
||||||
|
inline SparseMatrix& operator=(const EigenBase<OtherDerived>& other)
|
||||||
|
{ return Base::operator=(other); }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
template<typename OtherDerived>
|
template<typename OtherDerived>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user