aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen
diff options
context:
space:
mode:
authorGravatar Gael Guennebaud <g.gael@free.fr>2012-09-27 00:23:19 +0200
committerGravatar Gael Guennebaud <g.gael@free.fr>2012-09-27 00:23:19 +0200
commitb648484dbaa53c4651760e87657bf5113d19370b (patch)
tree52de093236c5eec2363b8d0e640dc23db5e276f9 /Eigen
parent44374788b5aacd1fbd130ebb86b0b37eb969ba61 (diff)
fix bug #515: missing explicit scalar conversion
Diffstat (limited to 'Eigen')
-rw-r--r--Eigen/src/Core/TriangularMatrix.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Eigen/src/Core/TriangularMatrix.h b/Eigen/src/Core/TriangularMatrix.h
index 3bf2a257d..fcd40e32f 100644
--- a/Eigen/src/Core/TriangularMatrix.h
+++ b/Eigen/src/Core/TriangularMatrix.h
@@ -511,6 +511,7 @@ template<typename Derived1, typename Derived2, bool ClearOpposite>
struct triangular_assignment_selector<Derived1, Derived2, StrictlyUpper, Dynamic, ClearOpposite>
{
typedef typename Derived1::Index Index;
+ typedef typename Derived1::Scalar Scalar;
static inline void run(Derived1 &dst, const Derived2 &src)
{
for(Index j = 0; j < dst.cols(); ++j)
@@ -520,7 +521,7 @@ struct triangular_assignment_selector<Derived1, Derived2, StrictlyUpper, Dynamic
dst.copyCoeff(i, j, src);
if (ClearOpposite)
for(Index i = maxi; i < dst.rows(); ++i)
- dst.coeffRef(i, j) = 0;
+ dst.coeffRef(i, j) = Scalar(0);
}
}
};