aboutsummaryrefslogtreecommitdiff
path: root/Eigen/src/Core/Solve.h
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2017-07-06 11:13:06 -0700
committerMiao Wang <miaowang@google.com>2017-07-06 20:19:54 +0000
commiteda03298de395cf6217486971e6529f92da8da79 (patch)
treecb15cce81c536015fc5d7c13e6ee5a64cf5c5480 /Eigen/src/Core/Solve.h
parent91ebe5d75039bce22610f2d1a5834f465cb4b40a (diff)
downloadeigen-eda03298de395cf6217486971e6529f92da8da79.tar.gz
Rebase Eigen to 3.3.4
Test: mm Test: build system image for sailfish Test: BLAS CTS tests pass Change-Id: I4944ef4940e8cd8dd77191cff20d506c9da43f02
Diffstat (limited to 'Eigen/src/Core/Solve.h')
-rw-r--r--Eigen/src/Core/Solve.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/Solve.h b/Eigen/src/Core/Solve.h
index 960a58597..a8daea511 100644
--- a/Eigen/src/Core/Solve.h
+++ b/Eigen/src/Core/Solve.h
@@ -34,12 +34,12 @@ template<typename Decomposition, typename RhsType,typename StorageKind> struct s
template<typename Decomposition, typename RhsType>
struct solve_traits<Decomposition,RhsType,Dense>
{
- typedef Matrix<typename RhsType::Scalar,
+ typedef typename make_proper_matrix_type<typename RhsType::Scalar,
Decomposition::ColsAtCompileTime,
RhsType::ColsAtCompileTime,
RhsType::PlainObject::Options,
Decomposition::MaxColsAtCompileTime,
- RhsType::MaxColsAtCompileTime> PlainObject;
+ RhsType::MaxColsAtCompileTime>::type PlainObject;
};
template<typename Decomposition, typename RhsType>