diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-06-24 23:35:17 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-06-24 23:35:17 +0200 |
| commit | 788941d3b11db7eb1d54dbb4b4116382873aff5c (patch) | |
| tree | 28fa1c071cab01a86fa009aedcb4b8c9e79f4dc2 /Eigen/src/SparseCore/SparseAssign.h | |
| parent | 4c8cd13b35e4f6ff095ea34b91379e897e63ae2d (diff) | |
Workaround MSVC ambiguous instanciation
Diffstat (limited to 'Eigen/src/SparseCore/SparseAssign.h')
| -rw-r--r-- | Eigen/src/SparseCore/SparseAssign.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Eigen/src/SparseCore/SparseAssign.h b/Eigen/src/SparseCore/SparseAssign.h index c939f6c92..1ce60f385 100644 --- a/Eigen/src/SparseCore/SparseAssign.h +++ b/Eigen/src/SparseCore/SparseAssign.h @@ -136,8 +136,8 @@ struct Assignment<DstXprType, SrcXprType, Functor, Sparse2Sparse, Scalar> }; // Sparse to Dense assignment -template< typename DstXprType, typename SrcXprType, typename Functor> -struct Assignment<DstXprType, SrcXprType, Functor, Sparse2Dense> +template< typename DstXprType, typename SrcXprType, typename Functor, typename Scalar> +struct Assignment<DstXprType, SrcXprType, Functor, Sparse2Dense, Scalar> { static void run(DstXprType &dst, const SrcXprType &src, const Functor &func) { @@ -152,8 +152,8 @@ struct Assignment<DstXprType, SrcXprType, Functor, Sparse2Dense> } }; -template< typename DstXprType, typename SrcXprType> -struct Assignment<DstXprType, SrcXprType, internal::assign_op<typename DstXprType::Scalar>, Sparse2Dense> +template< typename DstXprType, typename SrcXprType, typename Scalar> +struct Assignment<DstXprType, SrcXprType, internal::assign_op<typename DstXprType::Scalar>, Sparse2Dense, Scalar> { static void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<typename DstXprType::Scalar> &) { @@ -172,7 +172,7 @@ struct Assignment<DstXprType, SrcXprType, internal::assign_op<typename DstXprTyp // Specialization for "dst = dec.solve(rhs)" // NOTE we need to specialize it for Sparse2Sparse to avoid ambiguous specialization error template<typename DstXprType, typename DecType, typename RhsType, typename Scalar> -struct Assignment<DstXprType, Solve<DecType,RhsType>, internal::assign_op<Scalar>, Sparse2Sparse> +struct Assignment<DstXprType, Solve<DecType,RhsType>, internal::assign_op<Scalar>, Sparse2Sparse, Scalar> { typedef Solve<DecType,RhsType> SrcXprType; static void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<Scalar> &) |