Mercurial > octave-nkf

changeset 14717:9bd34ddf29fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge away extra head on default
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Sat, 02 Jun 2012 14:26:53 -0400
parents 52c5fb67fa5f (current diff) f5c3de9502b2 (diff)
children 3fd6f637c573 4ec5f49cdfe4
files
diffstat 2 files changed, 14 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/eigs-base.cc	Thu May 31 16:09:57 2012 -0400
+++ b/liboctave/eigs-base.cc	Sat Jun 02 14:26:53 2012 -0400
@@ -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	Thu May 31 16:09:57 2012 -0400
+++ b/liboctave/lo-cutils.c	Sat Jun 02 14:26:53 2012 -0400
@@ -92,6 +92,8 @@
 static void
 announce_mkdir (const char *dir, void *options)
 {
+  (void) dir;
+  (void) options;
   /* Do nothing */
 }