merge

2 files changed, 4 insertions, 4 deletions

diff --git a/Eigen/src/QR/SelfAdjointEigenSolver.h b/Eigen/src/QR/SelfAdjointEigenSolver.h
index 809a717b9..dd1736e28 100644
--- a/Eigen/src/QR/SelfAdjointEigenSolver.h
+++ b/Eigen/src/QR/SelfAdjointEigenSolver.h
@@ -380,7 +380,7 @@ static void ei_tridiagonal_qr_step(RealScalar* diag, RealScalar* subdiag, int st
     if (matrixQ)
     {
       Map<Matrix<Scalar,Dynamic,Dynamic> > q(matrixQ,n,n);
-      q.applyJacobiOnTheRight(k,k+1,c,s);
+      q.applyJacobiOnTheRight(k,k+1,JacobiRotation<RealScalar>(c,s));
     }
   }
 }
diff --git a/Eigen/src/SVD/SVD.h b/Eigen/src/SVD/SVD.h
index 1a7e6c49a..095e18b3e 100644
--- a/Eigen/src/SVD/SVD.h
+++ b/Eigen/src/SVD/SVD.h
@@ -309,7 +309,7 @@ SVD<MatrixType>& SVD<MatrixType>::compute(const MatrixType& matrix)
           h = Scalar(1.0)/h;
           c = g*h;
           s = -f*h;
-          V.applyJacobiOnTheRight(i,nm,c,s);
+          V.applyJacobiOnTheRight(i,nm,JacobiRotation<Scalar>(c,s));
         }
       }
       z = W[k];
@@ -351,7 +351,7 @@ SVD<MatrixType>& SVD<MatrixType>::compute(const MatrixType& matrix)
         g = g*c - x*s;
         h = y*s;
         y *= c;
-        V.applyJacobiOnTheRight(i,j,c,s);
+        V.applyJacobiOnTheRight(i,j,JacobiRotation<Scalar>(c,s));
         
         z = pythag(f,h);
         W[j] = z;
@@ -364,7 +364,7 @@ SVD<MatrixType>& SVD<MatrixType>::compute(const MatrixType& matrix)
         }
         f = c*g + s*y;
         x = c*y - s*g;
-        A.applyJacobiOnTheRight(i,j,c,s);
+        A.applyJacobiOnTheRight(i,j,JacobiRotation<Scalar>(c,s));
       }
       rv1[l] = 0.0;
       rv1[k] = f;