From 5afaacedc6129ae6c9488c8c6a0ec9179dda6abc Mon Sep 17 00:00:00 2001
From: Desire NUENTSA <desire.nuentsa_wakam@inria.fr>
Date: Fri, 7 Dec 2012 15:32:04 +0100
Subject: Update SPQR interface

---
 Eigen/src/SPQRSupport/SuiteSparseQRSupport.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Eigen/src/SPQRSupport')

diff --git a/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h b/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h
index a3880c9f8..17b764a37 100644
--- a/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h
+++ b/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h
@@ -49,7 +49,7 @@ namespace Eigen {
  * R is the sparse triangular factor. Use matrixQR() to get it as SparseMatrix.
  * NOTE : The Index type of R is always UF_long. You can get it with SPQR::Index
  * 
- * \tparam _MatrixType The type of the sparse matrix A, must be a SparseMatrix<>, either row-major or column-major. 
+ * \tparam _MatrixType The type of the sparse matrix A, must be a column-major SparseMatrix<>
  * NOTE 
  * 
  */
@@ -61,7 +61,7 @@ class SPQR
     typedef typename _MatrixType::RealScalar RealScalar;
     typedef UF_long Index ; 
     typedef SparseMatrix<Scalar, _MatrixType::Flags, Index> MatrixType;
-    typedef PermutationMatrix<Dynamic, Dynamic, Index> PermutationType;
+    typedef PermutationMatrix<Dynamic, Dynamic> PermutationType;
   public:
     SPQR() 
     : m_ordering(SPQR_ORDERING_DEFAULT),
@@ -153,7 +153,7 @@ class SPQR
     MatrixType matrixQR() const
     {
       MatrixType R; 
-      R = viewAsEigen<Scalar, MatrixType::Flags, Index>(*m_cR);
+      R = viewAsEigen<Scalar, MatrixType::Flags, typename MatrixType::Index>(*m_cR);
       return R; 
     }
     /// Get an expression of the matrix Q
-- 
cgit v1.2.3