mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-27 07:29:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

workaround weird MSVC compilation issue: a typdedef in a base class shadows a template parameter of a derived class

Browse Source
This commit is contained in:
Gael Guennebaud 2014-09-16 16:06:32 -07:00
parent 341ae8665d
commit 125619146b
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Eigen/src/SparseCore/SparseDenseProduct.h
View File

@ -402,30 +402,30 @@ struct generic_product_impl<Lhs, Rhs, DenseShape, SparseShape, ProductType>
} }
}; };
template<typename LhsT, typename RhsT, bool Transpose> template<typename LhsT, typename RhsT, bool NeedToTranspose>
struct sparse_dense_outer_product_evaluator struct sparse_dense_outer_product_evaluator
{ {
protected: protected:
typedef typename conditional<Transpose,RhsT,LhsT>::type Lhs1; typedef typename conditional<NeedToTranspose,RhsT,LhsT>::type Lhs1;
typedef typename conditional<Transpose,LhsT,RhsT>::type Rhs; typedef typename conditional<NeedToTranspose,LhsT,RhsT>::type ActualRhs;
typedef Product<LhsT,RhsT> ProdXprType; typedef Product<LhsT,RhsT,DefaultProduct> ProdXprType;
// if the actual left-hand side is a dense vector, // if the actual left-hand side is a dense vector,
// then build a sparse-view so that we can seamlessly iterator over it. // then build a sparse-view so that we can seamlessly iterator over it.
typedef typename conditional<is_same<typename internal::traits<Lhs1>::StorageKind,Sparse>::value, typedef typename conditional<is_same<typename internal::traits<Lhs1>::StorageKind,Sparse>::value,
Lhs1, SparseView<Lhs1> >::type Lhs; Lhs1, SparseView<Lhs1> >::type ActualLhs;
typedef typename conditional<is_same<typename internal::traits<Lhs1>::StorageKind,Sparse>::value, typedef typename conditional<is_same<typename internal::traits<Lhs1>::StorageKind,Sparse>::value,
Lhs1 const&, SparseView<Lhs1> >::type LhsArg; Lhs1 const&, SparseView<Lhs1> >::type LhsArg;
typedef typename evaluator<Lhs>::type LhsEval; typedef typename evaluator<ActualLhs>::type LhsEval;
typedef typename evaluator<Rhs>::type RhsEval; typedef typename evaluator<ActualRhs>::type RhsEval;
typedef typename evaluator<Lhs>::InnerIterator LhsIterator; typedef typename evaluator<ActualLhs>::InnerIterator LhsIterator;
typedef typename ProdXprType::Scalar Scalar; typedef typename ProdXprType::Scalar Scalar;
typedef typename ProdXprType::Index Index; typedef typename ProdXprType::Index Index;
public: public:
enum { enum {
Flags = Transpose ? RowMajorBit : 0, Flags = NeedToTranspose ? RowMajorBit : 0,
CoeffReadCost = Dynamic CoeffReadCost = Dynamic
}; };
@ -436,17 +436,16 @@ public:
: LhsIterator(xprEval.m_lhsXprImpl, 0), : LhsIterator(xprEval.m_lhsXprImpl, 0),
m_outer(outer), m_outer(outer),
m_empty(false), m_empty(false),
m_factor(get(xprEval.m_rhsXprImpl, outer, typename internal::traits<Rhs>::StorageKind() )) m_factor(get(xprEval.m_rhsXprImpl, outer, typename internal::traits<ActualRhs>::StorageKind() ))
{} {}
EIGEN_STRONG_INLINE Index outer() const { return m_outer; } EIGEN_STRONG_INLINE Index outer() const { return m_outer; }
EIGEN_STRONG_INLINE Index row() const { return Transpose ? m_outer : LhsIterator::index(); } EIGEN_STRONG_INLINE Index row() const { return NeedToTranspose ? m_outer : LhsIterator::index(); }
EIGEN_STRONG_INLINE Index col() const { return Transpose ? LhsIterator::index() : m_outer; } EIGEN_STRONG_INLINE Index col() const { return NeedToTranspose ? LhsIterator::index() : m_outer; }
EIGEN_STRONG_INLINE Scalar value() const { return LhsIterator::value() * m_factor; } EIGEN_STRONG_INLINE Scalar value() const { return LhsIterator::value() * m_factor; }
EIGEN_STRONG_INLINE operator bool() const { return LhsIterator::operator bool() && (!m_empty); } EIGEN_STRONG_INLINE operator bool() const { return LhsIterator::operator bool() && (!m_empty); }
protected: protected:
Scalar get(const RhsEval &rhs, Index outer, Dense = Dense()) const Scalar get(const RhsEval &rhs, Index outer, Dense = Dense()) const
{ {
@ -467,19 +466,19 @@ public:
Scalar m_factor; Scalar m_factor;
}; };
sparse_dense_outer_product_evaluator(const Lhs &lhs, const Rhs &rhs) sparse_dense_outer_product_evaluator(const ActualLhs &lhs, const ActualRhs &rhs)
: m_lhs(lhs), m_lhsXprImpl(m_lhs), m_rhsXprImpl(rhs) : m_lhs(lhs), m_lhsXprImpl(m_lhs), m_rhsXprImpl(rhs)
{} {}
// transpose case // transpose case
sparse_dense_outer_product_evaluator(const Rhs &rhs, const Lhs1 &lhs) sparse_dense_outer_product_evaluator(const ActualRhs &rhs, const Lhs1 &lhs)
: m_lhs(lhs), m_lhsXprImpl(m_lhs), m_rhsXprImpl(rhs) : m_lhs(lhs), m_lhsXprImpl(m_lhs), m_rhsXprImpl(rhs)
{} {}
protected: protected:
const LhsArg m_lhs; const LhsArg m_lhs;
typename evaluator<Lhs>::nestedType m_lhsXprImpl; typename evaluator<ActualLhs>::nestedType m_lhsXprImpl;
typename evaluator<Rhs>::nestedType m_rhsXprImpl; typename evaluator<ActualRhs>::nestedType m_rhsXprImpl;
}; };
// sparse * dense outer product // sparse * dense outer product