# HG changeset patch
# User Max Brister <max@2bass.com>
# Date 1338596655 18000
# Node ID b17e762fb3da39ed7b436a9a7ed689ee2979ccab
# Parent  39d52aa37a087e525a19739b93d4c5c64891317f# Parent  f5c3de9502b2f335260561b860735b0597bc38e0
maint: periodic merge of default to jit

diff -r 39d52aa37a08 -r b17e762fb3da liboctave/eigs-base.cc
--- 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
 
diff -r 39d52aa37a08 -r b17e762fb3da liboctave/lo-cutils.c
--- 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 */
 }