changeset 23443:3f1bf237908b

maint: Eliminate <cfloat.h> header from liboctave files. * build-aux/mk-opts.pl: Remove "#include <cfloat>" from script which creates *-opts.h * Array-util.cc, Array-util.h, Array.cc, Array.h, CColVector.h, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.h, CSparse.cc, CSparse.h, MSparse.h, Matrix.h, Range.cc, Sparse.h, boolMatrix.h, boolNDArray.h, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.h, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.h, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.h, fColVector.h, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.h, int16NDArray.h, int32NDArray.h, int64NDArray.h, int8NDArray.h, intNDArray.h, uint16NDArray.h, uint32NDArray.h, uint64NDArray.h, uint8NDArray.h, CollocWt.cc, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, LSODE.cc, LSODE.h, Quad.h, eigs-base.cc, eigs-base.h, lo-mappers.cc, lo-mappers.h, oct-norm.cc, lo-ieee.cc, lo-utils.cc, lo-utils.h, oct-refcount.h: Remove "#include <cfloat>". Add "#include <limits>" if necessary. Remove redundant #includes. Alphabetize #includes.
author Rik <rik@octave.org>
date Wed, 26 Apr 2017 09:57:28 -0700
parents 53f5f8231c37
children d6e81498e7fe
files build-aux/mk-opts.pl liboctave/array/Array-util.cc liboctave/array/Array-util.h liboctave/array/Array.cc liboctave/array/Array.h liboctave/array/CColVector.h liboctave/array/CDiagMatrix.h liboctave/array/CMatrix.cc liboctave/array/CMatrix.h liboctave/array/CNDArray.cc liboctave/array/CNDArray.h liboctave/array/CRowVector.h liboctave/array/CSparse.cc liboctave/array/CSparse.h liboctave/array/MSparse.h liboctave/array/Matrix.h liboctave/array/Range.cc liboctave/array/Sparse.h liboctave/array/boolMatrix.h liboctave/array/boolNDArray.h liboctave/array/boolSparse.h liboctave/array/chMatrix.h liboctave/array/chNDArray.h liboctave/array/dColVector.h liboctave/array/dDiagMatrix.h liboctave/array/dMatrix.cc liboctave/array/dMatrix.h liboctave/array/dNDArray.cc liboctave/array/dNDArray.h liboctave/array/dRowVector.h liboctave/array/dSparse.cc liboctave/array/dSparse.h liboctave/array/dim-vector.cc liboctave/array/dim-vector.h liboctave/array/fCColVector.h liboctave/array/fCDiagMatrix.h liboctave/array/fCMatrix.cc liboctave/array/fCMatrix.h liboctave/array/fCNDArray.cc liboctave/array/fCNDArray.h liboctave/array/fCRowVector.h liboctave/array/fColVector.h liboctave/array/fDiagMatrix.h liboctave/array/fMatrix.cc liboctave/array/fMatrix.h liboctave/array/fNDArray.cc liboctave/array/fNDArray.h liboctave/array/fRowVector.h liboctave/array/int16NDArray.h liboctave/array/int32NDArray.h liboctave/array/int64NDArray.h liboctave/array/int8NDArray.h liboctave/array/intNDArray.h liboctave/array/uint16NDArray.h liboctave/array/uint32NDArray.h liboctave/array/uint64NDArray.h liboctave/array/uint8NDArray.h liboctave/numeric/CollocWt.cc liboctave/numeric/DASPK.cc liboctave/numeric/DASPK.h liboctave/numeric/DASRT.cc liboctave/numeric/DASRT.h liboctave/numeric/DASSL.cc liboctave/numeric/DASSL.h liboctave/numeric/LSODE.cc liboctave/numeric/LSODE.h liboctave/numeric/Quad.h liboctave/numeric/eigs-base.cc liboctave/numeric/eigs-base.h liboctave/numeric/lo-mappers.cc liboctave/numeric/lo-mappers.h liboctave/numeric/oct-norm.cc liboctave/util/lo-ieee.cc liboctave/util/lo-utils.cc liboctave/util/lo-utils.h liboctave/util/oct-refcount.h
diffstat 76 files changed, 128 insertions(+), 226 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/mk-opts.pl	Wed Apr 26 01:20:50 2017 -0400
+++ b/build-aux/mk-opts.pl	Wed Apr 26 09:57:28 2017 -0700
@@ -374,7 +374,6 @@
 #if ! defined (octave_${CLASS_NAME}_h)
 #define octave_${CLASS_NAME}_h 1
 
-#include <cfloat>
 #include <cmath>
 
 #include <limits>
--- a/liboctave/array/Array-util.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/Array-util.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -26,7 +26,6 @@
 #endif
 
 #include "Array-util.h"
-#include "dim-vector.h"
 #include "lo-error.h"
 #include "oct-locbuf.h"
 
--- a/liboctave/array/Array-util.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/Array-util.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,8 +26,6 @@
 #include "octave-config.h"
 
 #include "Array.h"
-#include "dim-vector.h"
-#include "idx-vector.h"
 #include "lo-array-errwarn.h"
 
 extern OCTAVE_API bool index_in_bounds (const Array<octave_idx_type>& ra_idx,
--- a/liboctave/array/Array.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/Array.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -27,18 +27,10 @@
 // C++ source files that should have included config.h before including
 // this file.
 
-#include <cassert>
-
 #include <iostream>
-#include <sstream>
-#include <vector>
-#include <algorithm>
-#include <new>
-
+
+#include "Array-util.h"
 #include "Array.h"
-#include "Array-util.h"
-#include "idx-vector.h"
-#include "lo-error.h"
 #include "lo-mappers.h"
 #include "oct-locbuf.h"
 
--- a/liboctave/array/Array.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/Array.h	Wed Apr 26 09:57:28 2017 -0700
@@ -33,15 +33,16 @@
 
 #include <algorithm>
 #include <iosfwd>
+#include <string>
 
 #include "dim-vector.h"
 #include "idx-vector.h"
 #include "lo-error.h"
 #include "lo-traits.h"
 #include "lo-utils.h"
+#include "oct-refcount.h"
 #include "oct-sort.h"
 #include "quit.h"
-#include "oct-refcount.h"
 
 //! N Dimensional Array with copy-on-write semantics.
 /*!
--- a/liboctave/array/CColVector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CColVector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -27,7 +27,6 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/CDiagMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CDiagMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,14 +25,12 @@
 
 #include "octave-config.h"
 
-#include "MDiagArray2.h"
-
-#include "dRowVector.h"
+#include "CColVector.h"
 #include "CRowVector.h"
+#include "DET.h"
+#include "MDiagArray2.h"
 #include "dColVector.h"
-#include "CColVector.h"
-#include "DET.h"
-
+#include "dRowVector.h"
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/CMatrix.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CMatrix.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -27,28 +27,23 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
+#include <algorithm>
+#include <complex>
 #include <iostream>
-#include <vector>
-
-// FIXME
-#include <sys/types.h>
+#include <limits>
 
 #include "Array-util.h"
+#include "CDiagMatrix.h"
+#include "CMatrix.h"
+#include "CNDArray.h"
+#include "CRowVector.h"
+#include "DET.h"
 #include "boolMatrix.h"
 #include "chMatrix.h"
 #include "chol.h"
+#include "dDiagMatrix.h"
 #include "dMatrix.h"
-#include "CMatrix.h"
-#include "CNDArray.h"
-#include "CRowVector.h"
 #include "dRowVector.h"
-#include "CDiagMatrix.h"
-#include "dDiagMatrix.h"
-#include "schur.h"
-#include "svd.h"
-#include "DET.h"
 #include "functor.h"
 #include "lo-blas-proto.h"
 #include "lo-error.h"
@@ -65,6 +60,8 @@
 #include "oct-fftw.h"
 #include "oct-locbuf.h"
 #include "oct-norm.h"
+#include "schur.h"
+#include "svd.h"
 
 static const Complex Complex_NaN_result (octave::numeric_limits<double>::NaN (),
                                          octave::numeric_limits<double>::NaN ());
--- a/liboctave/array/CMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,15 +25,14 @@
 
 #include "octave-config.h"
 
+#include "CNDArray.h"
+#include "DET.h"
 #include "MArray.h"
 #include "MDiagArray2.h"
 #include "MatrixType.h"
-#include "CNDArray.h"
-
 #include "mx-defs.h"
 #include "mx-op-decl.h"
 #include "oct-cmplx.h"
-#include "DET.h"
 
 class
 OCTAVE_API
--- a/liboctave/array/CNDArray.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CNDArray.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -26,9 +26,8 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
-#include <vector>
+#include <complex>
+#include <iostream>
 
 #include "Array-util.h"
 #include "CNDArray.h"
@@ -37,8 +36,8 @@
 #include "lo-ieee.h"
 #include "lo-mappers.h"
 #include "mx-base.h"
+#include "mx-cnda-s.h"
 #include "mx-op-defs.h"
-#include "mx-cnda-s.h"
 #include "oct-fftw.h"
 #include "oct-locbuf.h"
 
--- a/liboctave/array/CNDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CNDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,10 +26,9 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
+#include "bsxfun-decl.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
-#include "bsxfun-decl.h"
 
 class
 OCTAVE_API
--- a/liboctave/array/CRowVector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CRowVector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -27,7 +27,6 @@
 
 #include "MArray.h"
 #include "dRowVector.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/CSparse.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CSparse.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -26,10 +26,8 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
+#include <complex>
 #include <iostream>
-#include <vector>
 
 #include "quit.h"
 #include "lo-ieee.h"
--- a/liboctave/array/CSparse.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/CSparse.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,20 +26,17 @@
 
 #include "octave-config.h"
 
-#include "dMatrix.h"
-#include "dNDArray.h"
+#include "CColVector.h"
 #include "CMatrix.h"
 #include "CNDArray.h"
-#include "dColVector.h"
-#include "CColVector.h"
-#include "oct-cmplx.h"
-
 #include "DET.h"
 #include "MSparse.h"
-
+#include "MatrixType.h"
 #include "Sparse-op-decls.h"
-
-#include "MatrixType.h"
+#include "dColVector.h"
+#include "dMatrix.h"
+#include "dNDArray.h"
+#include "oct-cmplx.h"
 
 class PermMatrix;
 class DiagMatrix;
--- a/liboctave/array/MSparse.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/MSparse.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,11 +26,11 @@
 
 #include "octave-config.h"
 
-#include "quit.h"
-#include "lo-error.h"
+#include "Array-util.h"
+#include "MArray.h"
 #include "Sparse.h"
-#include "MArray.h"
-#include "Array-util.h"
+#include "lo-error.h"
+#include "quit.h"
 
 
 // Two dimensional sparse array with math ops.
--- a/liboctave/array/Matrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/Matrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -30,9 +30,7 @@
 #include "octave-config.h"
 
 #include "mx-base.h"
-
 #include "mx-ext.h"
-
 #include "mx-ops.h"
 
 #endif
--- a/liboctave/array/Range.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/Range.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -24,17 +24,17 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
+#include <cmath>
 
 #include <iostream>
 #include <limits>
 
+#include "Array-util.h"
 #include "Range.h"
 #include "lo-error.h"
 #include "lo-mappers.h"
 #include "lo-math.h"
 #include "lo-utils.h"
-#include "Array-util.h"
 
 bool
 Range::all_elements_are_ints (void) const
--- a/liboctave/array/Sparse.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/Sparse.h	Wed Apr 26 09:57:28 2017 -0700
@@ -1,4 +1,3 @@
-// Template sparse classes
 /*
 
 Copyright (C) 2004-2017 David Bateman
@@ -33,12 +32,9 @@
 
 #include <algorithm>
 #include <iosfwd>
+#include <string>
 
 #include "Array.h"
-#include "dim-vector.h"
-#include "lo-error.h"
-#include "lo-utils.h"
-#include "oct-sort.h"
 
 class idx_vector;
 class PermMatrix;
--- a/liboctave/array/boolMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/boolMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -28,7 +28,6 @@
 
 #include "Array.h"
 #include "boolNDArray.h"
-
 #include "mx-defs.h"
 #include "mx-op-decl.h"
 
--- a/liboctave/array/boolNDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/boolNDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,10 +26,9 @@
 #include "octave-config.h"
 
 #include "Array.h"
-
+#include "bsxfun-decl.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
-#include "bsxfun-decl.h"
 
 class
 OCTAVE_API
--- a/liboctave/array/boolSparse.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/boolSparse.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,14 +26,12 @@
 
 #include "octave-config.h"
 
+#include "MSparse.h"
+#include "PermMatrix.h"
+#include "Sparse-op-decls.h"
 #include "Sparse.h"
-#include "MSparse.h"
-
 #include "boolMatrix.h"
 #include "boolNDArray.h"
-#include "PermMatrix.h"
-
-#include "Sparse-op-decls.h"
 
 class SparseMatrix;
 
--- a/liboctave/array/chMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/chMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -30,7 +30,6 @@
 
 #include "Array.h"
 #include "chNDArray.h"
-
 #include "mx-defs.h"
 #include "mx-op-decl.h"
 #include "str-vec.h"
--- a/liboctave/array/chNDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/chNDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,13 +25,10 @@
 
 #include "octave-config.h"
 
-#include <string>
-
 #include "Array.h"
-
+#include "bsxfun-decl.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
-#include "bsxfun-decl.h"
 #include "str-vec.h"
 
 class
--- a/liboctave/array/dColVector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dColVector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -27,7 +27,6 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/dDiagMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dDiagMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,12 +25,10 @@
 
 #include "octave-config.h"
 
+#include "DET.h"
 #include "MDiagArray2.h"
-
+#include "dColVector.h"
 #include "dRowVector.h"
-#include "dColVector.h"
-#include "DET.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/dMatrix.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dMatrix.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -27,26 +27,23 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
+#include <algorithm>
 #include <iostream>
-#include <vector>
+#include <limits>
 
 #include "Array-util.h"
+#include "CColVector.h"
+#include "CMatrix.h"
+#include "DET.h"
+#include "PermMatrix.h"
+#include "boolMatrix.h"
 #include "byte-swap.h"
-#include "boolMatrix.h"
 #include "chMatrix.h"
 #include "chol.h"
-#include "dMatrix.h"
+#include "dColVector.h"
 #include "dDiagMatrix.h"
-#include "CMatrix.h"
-#include "dColVector.h"
+#include "dMatrix.h"
 #include "dRowVector.h"
-#include "CColVector.h"
-#include "PermMatrix.h"
-#include "DET.h"
-#include "schur.h"
-#include "svd.h"
 #include "functor.h"
 #include "lo-blas-proto.h"
 #include "lo-error.h"
@@ -54,15 +51,17 @@
 #include "lo-lapack-proto.h"
 #include "lo-mappers.h"
 #include "lo-utils.h"
-#include "mx-m-dm.h"
 #include "mx-dm-m.h"
 #include "mx-inlines.cc"
+#include "mx-m-dm.h"
 #include "mx-op-defs.h"
 #include "oct-cmplx.h"
 #include "oct-fftw.h"
 #include "oct-locbuf.h"
 #include "oct-norm.h"
 #include "quit.h"
+#include "schur.h"
+#include "svd.h"
 
 // Matrix class.
 
--- a/liboctave/array/dMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,14 +25,13 @@
 
 #include "octave-config.h"
 
-#include "dNDArray.h"
+#include "DET.h"
 #include "MArray.h"
 #include "MDiagArray2.h"
 #include "MatrixType.h"
-
+#include "dNDArray.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
-#include "DET.h"
 
 class
 OCTAVE_API
--- a/liboctave/array/dNDArray.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dNDArray.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -26,9 +26,8 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
-#include <vector>
+#include <iostream>
+#include <limits>
 
 #include "Array-util.h"
 #include "dNDArray.h"
--- a/liboctave/array/dNDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dNDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,10 +26,9 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
+#include "bsxfun-decl.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
-#include "bsxfun-decl.h"
 
 template <typename T> class intNDArray;
 
--- a/liboctave/array/dRowVector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dRowVector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,7 +26,6 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/dSparse.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dSparse.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -26,11 +26,7 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
 #include <iostream>
-#include <vector>
-#include <functional>
 
 #include "quit.h"
 #include "lo-ieee.h"
--- a/liboctave/array/dSparse.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dSparse.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,18 +26,15 @@
 
 #include "octave-config.h"
 
+#include "CColVector.h"
+#include "CMatrix.h"
+#include "DET.h"
+#include "MSparse.h"
+#include "MatrixType.h"
+#include "Sparse-op-decls.h"
+#include "dColVector.h"
 #include "dMatrix.h"
 #include "dNDArray.h"
-#include "CMatrix.h"
-#include "dColVector.h"
-#include "CColVector.h"
-
-#include "DET.h"
-#include "MSparse.h"
-
-#include "Sparse-op-decls.h"
-
-#include "MatrixType.h"
 
 class PermMatrix;
 class DiagMatrix;
--- a/liboctave/array/dim-vector.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dim-vector.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,9 @@
 #  include "config.h"
 #endif
 
+#include <limits>
+#include <new>
 #include <sstream>
-#include <limits>
-#include <string>
-#include <new>
 
 #include "dim-vector.h"
 
--- a/liboctave/array/dim-vector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/dim-vector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -32,7 +32,6 @@
 #include <initializer_list>
 #include <string>
 
-#include "lo-error.h"
 #include "oct-refcount.h"
 
 //! Vector representing the dimensions (size) of an Array.
--- a/liboctave/array/fCColVector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fCColVector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -27,7 +27,6 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/fCDiagMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fCDiagMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,14 +25,12 @@
 
 #include "octave-config.h"
 
+#include "DET.h"
 #include "MDiagArray2.h"
-
-#include "fRowVector.h"
+#include "fCColVector.h"
 #include "fCRowVector.h"
 #include "fColVector.h"
-#include "fCColVector.h"
-#include "DET.h"
-
+#include "fRowVector.h"
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/fCMatrix.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fCMatrix.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -27,26 +27,21 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
+#include <algorithm>
+#include <complex>
 #include <iostream>
-#include <vector>
-
-// FIXME
-#include <sys/types.h>
+#include <limits>
 
 #include "Array-util.h"
 #include "DET.h"
 #include "boolMatrix.h"
 #include "chMatrix.h"
 #include "chol.h"
+#include "fCColVector.h"
+#include "fCDiagMatrix.h"
 #include "fCMatrix.h"
 #include "fCNDArray.h"
-#include "fCDiagMatrix.h"
-#include "fCColVector.h"
 #include "fCRowVector.h"
-#include "schur.h"
-#include "svd.h"
 #include "functor.h"
 #include "lo-blas-proto.h"
 #include "lo-error.h"
@@ -63,6 +58,8 @@
 #include "oct-fftw.h"
 #include "oct-locbuf.h"
 #include "oct-norm.h"
+#include "schur.h"
+#include "svd.h"
 
 static const FloatComplex FloatComplex_NaN_result (octave::numeric_limits<float>::NaN (),
                                                    octave::numeric_limits<float>::NaN ());
--- a/liboctave/array/fCMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fCMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,15 +25,14 @@
 
 #include "octave-config.h"
 
-#include "fCNDArray.h"
+#include "DET.h"
 #include "MArray.h"
 #include "MDiagArray2.h"
 #include "MatrixType.h"
-
+#include "fCNDArray.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
 #include "oct-cmplx.h"
-#include "DET.h"
 
 class
 OCTAVE_API
--- a/liboctave/array/fCNDArray.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fCNDArray.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -26,9 +26,8 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
-#include <vector>
+#include <complex>
+#include <iostream>
 
 #include "Array-util.h"
 #include "f77-fcn.h"
--- a/liboctave/array/fCNDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fCNDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,10 +26,9 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
+#include "bsxfun-decl.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
-#include "bsxfun-decl.h"
 
 class
 OCTAVE_API
--- a/liboctave/array/fCRowVector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fCRowVector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -27,7 +27,6 @@
 
 #include "MArray.h"
 #include "fRowVector.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/fColVector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fColVector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -27,7 +27,6 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/fDiagMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fDiagMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,12 +25,10 @@
 
 #include "octave-config.h"
 
+#include "DET.h"
 #include "MDiagArray2.h"
-
+#include "fColVector.h"
 #include "fRowVector.h"
-#include "fColVector.h"
-#include "DET.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/fMatrix.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fMatrix.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -27,28 +27,25 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
+#include <algorithm>
 #include <iostream>
-#include <vector>
-
-#include "fNDArray.h"
+#include <limits>
+
 #include "Array-util.h"
+#include "DET.h"
+#include "PermMatrix.h"
 #include "boolMatrix.h"
+#include "byte-swap.h"
 #include "chMatrix.h"
 #include "chol.h"
-#include "fMatrix.h"
-#include "fDiagMatrix.h"
+#include "fCColVector.h"
 #include "fCMatrix.h"
 #include "fColVector.h"
+#include "fDiagMatrix.h"
+#include "fMatrix.h"
+#include "fMatrix.h"
+#include "fNDArray.h"
 #include "fRowVector.h"
-#include "fCColVector.h"
-#include "PermMatrix.h"
-#include "DET.h"
-#include "byte-swap.h"
-#include "fMatrix.h"
-#include "schur.h"
-#include "svd.h"
 #include "functor.h"
 #include "lo-blas-proto.h"
 #include "lo-error.h"
@@ -65,6 +62,8 @@
 #include "oct-locbuf.h"
 #include "oct-norm.h"
 #include "quit.h"
+#include "schur.h"
+#include "svd.h"
 
 // Matrix class.
 
--- a/liboctave/array/fMatrix.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fMatrix.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,14 +25,13 @@
 
 #include "octave-config.h"
 
-#include "fNDArray.h"
+#include "DET.h"
 #include "MArray.h"
 #include "MDiagArray2.h"
 #include "MatrixType.h"
-
+#include "fNDArray.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
-#include "DET.h"
 
 class
 OCTAVE_API
--- a/liboctave/array/fNDArray.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fNDArray.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -26,9 +26,8 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
-#include <vector>
+#include <iostream>
+#include <limits>
 
 #include "Array-util.h"
 #include "f77-fcn.h"
--- a/liboctave/array/fNDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fNDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,10 +26,9 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
+#include "bsxfun-decl.h"
 #include "mx-defs.h"
 #include "mx-op-decl.h"
-#include "bsxfun-decl.h"
 
 template <typename T> class intNDArray;
 
--- a/liboctave/array/fRowVector.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/fRowVector.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,7 +26,6 @@
 #include "octave-config.h"
 
 #include "MArray.h"
-
 #include "mx-defs.h"
 
 class
--- a/liboctave/array/int16NDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/int16NDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,10 @@
 
 #include "octave-config.h"
 
+#include "bsxfun-decl.h"
 #include "intNDArray.h"
 #include "mx-op-decl.h"
 #include "oct-inttypes-fwd.h"
-#include "bsxfun-decl.h"
 
 typedef intNDArray<octave_int16> int16NDArray;
 
--- a/liboctave/array/int32NDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/int32NDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,10 @@
 
 #include "octave-config.h"
 
+#include "bsxfun-decl.h"
 #include "intNDArray.h"
 #include "mx-op-decl.h"
 #include "oct-inttypes-fwd.h"
-#include "bsxfun-decl.h"
 
 typedef intNDArray<octave_int32> int32NDArray;
 
--- a/liboctave/array/int64NDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/int64NDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,10 @@
 
 #include "octave-config.h"
 
+#include "bsxfun-decl.h"
 #include "intNDArray.h"
 #include "mx-op-decl.h"
 #include "oct-inttypes-fwd.h"
-#include "bsxfun-decl.h"
 
 typedef intNDArray<octave_int64> int64NDArray;
 
--- a/liboctave/array/int8NDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/int8NDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,10 @@
 
 #include "octave-config.h"
 
+#include "bsxfun-decl.h"
 #include "intNDArray.h"
 #include "mx-op-decl.h"
 #include "oct-inttypes-fwd.h"
-#include "bsxfun-decl.h"
 
 typedef intNDArray<octave_int8> int8NDArray;
 
--- a/liboctave/array/intNDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/intNDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -27,6 +27,7 @@
 
 #include "MArray.h"
 #include "boolNDArray.h"
+
 class NDArray;
 
 template <typename T>
--- a/liboctave/array/uint16NDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/uint16NDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,10 @@
 
 #include "octave-config.h"
 
+#include "bsxfun-decl.h"
 #include "intNDArray.h"
 #include "mx-op-decl.h"
 #include "oct-inttypes-fwd.h"
-#include "bsxfun-decl.h"
 
 typedef intNDArray<octave_uint16> uint16NDArray;
 
--- a/liboctave/array/uint32NDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/uint32NDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,10 @@
 
 #include "octave-config.h"
 
+#include "bsxfun-decl.h"
 #include "intNDArray.h"
 #include "mx-op-decl.h"
 #include "oct-inttypes-fwd.h"
-#include "bsxfun-decl.h"
 
 typedef intNDArray<octave_uint32> uint32NDArray;
 
--- a/liboctave/array/uint64NDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/uint64NDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,10 @@
 
 #include "octave-config.h"
 
+#include "bsxfun-decl.h"
 #include "intNDArray.h"
 #include "mx-op-decl.h"
 #include "oct-inttypes-fwd.h"
-#include "bsxfun-decl.h"
 
 typedef intNDArray<octave_uint64> uint64NDArray;
 
--- a/liboctave/array/uint8NDArray.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/array/uint8NDArray.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,10 +25,10 @@
 
 #include "octave-config.h"
 
+#include "bsxfun-decl.h"
 #include "intNDArray.h"
 #include "mx-op-decl.h"
 #include "oct-inttypes-fwd.h"
-#include "bsxfun-decl.h"
 
 typedef intNDArray<octave_uint8> uint8NDArray;
 
--- a/liboctave/numeric/CollocWt.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/CollocWt.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -25,8 +25,7 @@
 #endif
 
 #include <iostream>
-
-#include <cfloat>
+#include <limits>
 
 #include "CollocWt.h"
 #include "f77-fcn.h"
--- a/liboctave/numeric/DASPK.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/DASPK.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -24,8 +24,6 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
 #include <sstream>
 
 #include "DASPK.h"
--- a/liboctave/numeric/DASPK.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/DASPK.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,7 +25,7 @@
 
 #include "octave-config.h"
 
-#include <cfloat>
+#include <string>
 
 #include "DASPK-opts.h"
 
--- a/liboctave/numeric/DASRT.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/DASRT.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -24,8 +24,6 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
 #include <sstream>
 
 #include "DASRT.h"
--- a/liboctave/numeric/DASRT.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/DASRT.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,7 +25,7 @@
 
 #include "octave-config.h"
 
-#include <cfloat>
+#include <string>
 
 #include "DASRT-opts.h"
 
--- a/liboctave/numeric/DASSL.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/DASSL.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -24,8 +24,6 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
 #include <sstream>
 
 #include "DASSL.h"
--- a/liboctave/numeric/DASSL.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/DASSL.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,7 +25,7 @@
 
 #include "octave-config.h"
 
-#include <cfloat>
+#include <string>
 
 #include "DASSL-opts.h"
 
--- a/liboctave/numeric/LSODE.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/LSODE.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -24,8 +24,6 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
 #include <sstream>
 
 #include "LSODE.h"
--- a/liboctave/numeric/LSODE.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/LSODE.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,7 +25,7 @@
 
 #include "octave-config.h"
 
-#include <cfloat>
+#include <string>
 
 #include "LSODE-opts.h"
 
--- a/liboctave/numeric/Quad.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/Quad.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,8 +25,6 @@
 
 #include "octave-config.h"
 
-#include <cfloat>
-
 #include "dColVector.h"
 #include "fColVector.h"
 
--- a/liboctave/numeric/eigs-base.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/eigs-base.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -24,13 +24,10 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
 #include <cmath>
-#include <vector>
 #include <iostream>
 
 #include "CSparse.h"
-#include "lu.h"
 #include "MatrixType.h"
 #include "chol.h"
 #include "dSparse.h"
@@ -38,6 +35,7 @@
 #include "f77-fcn.h"
 #include "lo-arpack-proto.h"
 #include "lo-blas-proto.h"
+#include "lu.h"
 #include "mx-ops.h"
 #include "oct-locbuf.h"
 #include "oct-rand.h"
--- a/liboctave/numeric/eigs-base.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/eigs-base.h	Wed Apr 26 09:57:28 2017 -0700
@@ -26,6 +26,7 @@
 #include "octave-config.h"
 
 #include <iosfwd>
+#include <string>
 
 #include "oct-cmplx.h"
 
--- a/liboctave/numeric/lo-mappers.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/lo-mappers.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -25,8 +25,6 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
-
 #include "lo-error.h"
 #include "lo-ieee.h"
 #include "lo-mappers.h"
--- a/liboctave/numeric/lo-mappers.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/lo-mappers.h	Wed Apr 26 09:57:28 2017 -0700
@@ -28,10 +28,10 @@
 
 #include <limits>
 
+#include "lo-ieee.h"
+#include "lo-math.h"
 #include "oct-cmplx.h"
 #include "oct-inttypes-fwd.h"
-#include "lo-math.h"
-#include "lo-ieee.h"
 
 namespace octave
 {
--- a/liboctave/numeric/oct-norm.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/numeric/oct-norm.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -26,11 +26,9 @@
 #  include "config.h"
 #endif
 
-#include <cassert>
-#include <cfloat>
 #include <cmath>
 
-#include <iostream>
+#include <limits>
 #include <vector>
 
 #include "Array-util.h"
--- a/liboctave/util/lo-ieee.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/util/lo-ieee.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -24,9 +24,7 @@
 #  include "config.h"
 #endif
 
-#include <cfloat>
 #include <cmath>
-#include <cstdlib>
 
 #include <limits>
 
--- a/liboctave/util/lo-utils.cc	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/util/lo-utils.cc	Wed Apr 26 09:57:28 2017 -0700
@@ -1,4 +1,3 @@
-// utils.cc
 /*
 
 Copyright (C) 1996-2017 John W. Eaton
@@ -25,12 +24,10 @@
 #  include "config.h"
 #endif
 
-#include <cctype>
 #include <cstdlib>
-#include <cstdio>
 #include <cstring>
-#include <cfloat>
 
+#include <complex>
 #include <limits>
 #include <string>
 
--- a/liboctave/util/lo-utils.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/util/lo-utils.h	Wed Apr 26 09:57:28 2017 -0700
@@ -30,10 +30,9 @@
 #include <iostream>
 #include <string>
 
-#include "quit.h"
-
 #include "lo-cutils.h"
 #include "oct-cmplx.h"
+#include "quit.h"
 
 // Generic any/all test functionality with arbitrary predicate.
 
--- a/liboctave/util/oct-refcount.h	Wed Apr 26 01:20:50 2017 -0400
+++ b/liboctave/util/oct-refcount.h	Wed Apr 26 09:57:28 2017 -0700
@@ -25,8 +25,6 @@
 
 #include "octave-config.h"
 
-#include "octave-config.h"
-
 #if (defined (OCTAVE_ENABLE_ATOMIC_REFCOUNT) \
      && (defined (__GNUC__) || defined (_MSC_VER)))