# HG changeset patch # User John W. Eaton # Date 1455722196 18000 # Node ID d3b265a83adcbde29b87f8fe70c5e2ac5e18ab45 # Parent 41e39c9b35d31854c7e1f1c01453ed723f3a771c make building without qrupdate work again diff -r 41e39c9b35d3 -r d3b265a83adc liboctave/numeric/chol.cc --- 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" diff -r 41e39c9b35d3 -r d3b265a83adc liboctave/numeric/qr.cc --- 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 +template static T insert_col (const T& a, octave_idx_type i, const CV_T& x) @@ -389,7 +388,7 @@ return retval; } -template +template static T insert_row (const T& a, octave_idx_type i, const RV_T& x)