Mercurial > octave-nkf

changeset 14929:b17e762fb3da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: periodic merge of default to jit
author Max Brister <max@2bass.com>
date Fri, 01 Jun 2012 19:24:15 -0500
parents 39d52aa37a08 (current diff) f5c3de9502b2 (diff)
children 7d44ed216b98
files
diffstat 2 files changed, 14 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/eigs-base.cc	Fri Jun 01 19:08:43 2012 -0500
+++ b/liboctave/eigs-base.cc	Fri Jun 01 19:24:15 2012 -0500
@@ -3833,43 +3833,43 @@
 #endif
 
 #ifndef _MSC_VER
-template static octave_idx_type
+template octave_idx_type
 lusolve (const SparseMatrix&, const SparseMatrix&, Matrix&);
 
-template static octave_idx_type
+template octave_idx_type
 lusolve (const SparseComplexMatrix&, const SparseComplexMatrix&,
          ComplexMatrix&);
 
-template static octave_idx_type
+template octave_idx_type
 lusolve (const Matrix&, const Matrix&, Matrix&);
 
-template static octave_idx_type
+template octave_idx_type
 lusolve (const ComplexMatrix&, const ComplexMatrix&, ComplexMatrix&);
 
-template static ComplexMatrix
+template ComplexMatrix
 ltsolve (const SparseComplexMatrix&, const ColumnVector&,
          const ComplexMatrix&);
 
-template static Matrix
+template Matrix
 ltsolve (const SparseMatrix&, const ColumnVector&, const Matrix&);
 
-template static ComplexMatrix
+template ComplexMatrix
 ltsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&);
 
-template static Matrix
+template Matrix
 ltsolve (const Matrix&, const ColumnVector&, const Matrix&);
 
-template static ComplexMatrix
+template ComplexMatrix
 utsolve (const SparseComplexMatrix&, const ColumnVector&,
          const ComplexMatrix&);
 
-template static Matrix
+template Matrix
 utsolve (const SparseMatrix&, const ColumnVector&, const Matrix&);
 
-template static ComplexMatrix
+template ComplexMatrix
 utsolve (const ComplexMatrix&, const ColumnVector&, const ComplexMatrix&);
 
-template static Matrix
+template Matrix
 utsolve (const Matrix&, const ColumnVector&, const Matrix&);
 #endif
 
--- a/liboctave/lo-cutils.c	Fri Jun 01 19:08:43 2012 -0500
+++ b/liboctave/lo-cutils.c	Fri Jun 01 19:24:15 2012 -0500
@@ -92,6 +92,8 @@
 static void
 announce_mkdir (const char *dir, void *options)
 {
+  (void) dir;
+  (void) options;
   /* Do nothing */
 }