Mercurial > octave

changeset 21285:d3b265a83adc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make building without qrupdate work again
author John W. Eaton <jwe@octave.org>
date Wed, 17 Feb 2016 10:16:36 -0500
parents 41e39c9b35d3
children 2c93596507fe
files liboctave/numeric/chol.cc liboctave/numeric/qr.cc
diffstat 2 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/numeric/chol.cc	Wed Feb 17 00:06:06 2016 -0800
+++ b/liboctave/numeric/chol.cc	Wed Feb 17 10:16:36 2016 -0500
@@ -46,10 +46,7 @@
 #include "oct-norm.h"
 
 #if ! defined (HAVE_QRUPDATE)
-#  include "CmplxQR.h"
-#  include "dbleQR.h"
-#  include "fCmplxQR.h"
-#  include "floatQR.h"
+#  include "qr.h"
 #endif
 
 extern "C"
--- a/liboctave/numeric/qr.cc	Wed Feb 17 00:06:06 2016 -0800
+++ b/liboctave/numeric/qr.cc	Wed Feb 17 10:16:36 2016 -0500
@@ -326,7 +326,6 @@
 
 // Replacement update methods.
 
-static
 void
 warn_qrupdate_once (void)
 {
@@ -375,7 +374,7 @@
   init (q*r + u * v.hermitian (), get_type ());
 }
 
-template <typename T>
+template <typename T, typename CV_T>
 static
 T
 insert_col (const T& a, octave_idx_type i, const CV_T& x)
@@ -389,7 +388,7 @@
   return retval;
 }
 
-template <typename T>
+template <typename T, typename RV_T>
 static
 T
 insert_row (const T& a, octave_idx_type i, const RV_T& x)