# HG changeset patch
# User Jordi Gutiérrez Hermoso <jordigh@octave.org>
# Date 1338661613 14400
# Node ID 9bd34ddf29fe7376036f781edd5557f0e1c4b766
# Parent  52c5fb67fa5f2f0f14e4eabfc7f8fd3a1a237a56# Parent  f5c3de9502b2f335260561b860735b0597bc38e0
Merge away extra head on default

diff -r 52c5fb67fa5f -r 9bd34ddf29fe liboctave/eigs-base.cc
--- 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
 
diff -r 52c5fb67fa5f -r 9bd34ddf29fe liboctave/lo-cutils.c
--- 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 */
 }