# HG changeset patch
# User jwe
# Date 810346023 0
# Node ID 9f9131a8d706ea419d77ae65af41c6b6e1594f18
# Parent  f75432dff0066bdf99dacce81772865b5a4202a5
[project @ 1995-09-06 00:07:03 by jwe]

diff --git a/libcruft/misc/lo-error.cc b/libcruft/misc/lo-error.cc
--- a/libcruft/misc/lo-error.cc
+++ b/libcruft/misc/lo-error.cc
@@ -25,9 +25,9 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
 
 #include "lo-error.h"
 
diff --git a/liboctave/Array.cc b/liboctave/Array.cc
--- a/liboctave/Array.cc
+++ b/liboctave/Array.cc
@@ -29,7 +29,7 @@
 #include <config.h>
 #endif
 
-#include <assert.h>
+#include <cassert>
 
 #include "Array.h"
 
diff --git a/liboctave/CMatrix.cc b/liboctave/CMatrix.cc
--- a/liboctave/CMatrix.cc
+++ b/liboctave/CMatrix.cc
@@ -29,18 +29,20 @@
 #include <config.h>
 #endif
 
-#include <sys/types.h>
+#include <cfloat>
+
 #include <iostream.h>
-#include <float.h>
+
+#include <sys/types.h> // XXX FIXME XXX
 
 #include <Complex.h>
 
-#include "mx-base.h"
 #include "CmplxDET.h"
 #include "CmplxSVD.h"
-#include "mx-inlines.cc"
+#include "f77-uscore.h"
 #include "lo-error.h"
-#include "f77-uscore.h"
+#include "mx-base.h"
+#include "mx-inlines.cc"
 
 // Fortran functions we call.
 
diff --git a/liboctave/CmplxDET.cc b/liboctave/CmplxDET.cc
--- a/liboctave/CmplxDET.cc
+++ b/liboctave/CmplxDET.cc
@@ -29,8 +29,8 @@
 #include <config.h>
 #endif
 
-#include <math.h>
-#include <float.h>
+#include <cfloat>
+#include <cmath>
 
 #include <Complex.h>
 
diff --git a/liboctave/CmplxQRP.cc b/liboctave/CmplxQRP.cc
--- a/liboctave/CmplxQRP.cc
+++ b/liboctave/CmplxQRP.cc
@@ -29,12 +29,12 @@
 #include <config.h>
 #endif
 
-#include <assert.h>
+#include <cassert>
 
 #include "CmplxQRP.h"
-#include "mx-inlines.cc"
+#include "f77-uscore.h"
 #include "lo-error.h"
-#include "f77-uscore.h"
+#include "mx-inlines.cc"
 
 extern "C"
 {
diff --git a/liboctave/LSODE.cc b/liboctave/LSODE.cc
--- a/liboctave/LSODE.cc
+++ b/liboctave/LSODE.cc
@@ -29,8 +29,9 @@
 #include <config.h>
 #endif
 
-#include <math.h>
-#include <float.h>
+#include <cfloat>
+#include <cmath>
+
 #include <iostream.h>
 
 #include "ODE.h"
diff --git a/liboctave/NLEqn.cc b/liboctave/NLEqn.cc
--- a/liboctave/NLEqn.cc
+++ b/liboctave/NLEqn.cc
@@ -29,8 +29,8 @@
 #include <config.h>
 #endif
 
-#include <float.h>
-#include <math.h>
+#include <cfloat>
+#include <cmath>
 
 #include "NLEqn.h"
 #include "dMatrix.h"
diff --git a/liboctave/NPSOL.cc b/liboctave/NPSOL.cc
--- a/liboctave/NPSOL.cc
+++ b/liboctave/NPSOL.cc
@@ -29,9 +29,10 @@
 #include <config.h>
 #endif
 
-#include <math.h>
-#include <float.h>
-#include <string.h>
+#include <cfloat>
+#include <cmath>
+#include <cstring>
+
 #include <strstream.h>
 
 #ifndef NPSOL_MISSING
diff --git a/liboctave/QLD.cc b/liboctave/QLD.cc
--- a/liboctave/QLD.cc
+++ b/liboctave/QLD.cc
@@ -29,13 +29,14 @@
 #include <config.h>
 #endif
 
-#include <math.h>
+#include <cmath>
+
 #include <iostream.h>
 
-#include "dMatrix.h"
+#include "QLD.h"
 #include "dColVector.h"
+#include "dMatrix.h"
 #include "dRowVector.h"
-#include "QLD.h"
 #include "f77-uscore.h"
 
 extern "C"
diff --git a/liboctave/QPSOL.cc b/liboctave/QPSOL.cc
--- a/liboctave/QPSOL.cc
+++ b/liboctave/QPSOL.cc
@@ -29,8 +29,8 @@
 #include <config.h>
 #endif
 
-#include <math.h>
-#include <float.h>
+#include <cfloat>
+#include <cmath>
 
 #ifndef QPSOL_MISSING
 
diff --git a/liboctave/Quad.cc b/liboctave/Quad.cc
--- a/liboctave/Quad.cc
+++ b/liboctave/Quad.cc
@@ -29,8 +29,8 @@
 #include <config.h>
 #endif
 
-#include <math.h>
-#include <float.h>
+#include <cfloat>
+#include <cmath>
 
 #include "Quad.h"
 #include "f77-uscore.h"
diff --git a/liboctave/Range.cc b/liboctave/Range.cc
--- a/liboctave/Range.cc
+++ b/liboctave/Range.cc
@@ -29,8 +29,9 @@
 #include <config.h>
 #endif
 
+#include <climits>
+
 #include <iostream.h>
-#include <limits.h>
 
 #include "Range.h"
 #include "dMatrix.h"
diff --git a/liboctave/dMatrix.cc b/liboctave/dMatrix.cc
--- a/liboctave/dMatrix.cc
+++ b/liboctave/dMatrix.cc
@@ -29,19 +29,21 @@
 #include <config.h>
 #endif
 
-#include <sys/types.h>
+#include <cfloat>
+#include <cstdio>
+
 #include <iostream.h>
-#include <stdio.h>
-#include <float.h>
+
+#include <sys/types.h> // XXX FIXME XXX
 
 #include <Complex.h>
 
-#include "mx-base.h"
 #include "dbleDET.h"
 #include "dbleSVD.h"
-#include "mx-inlines.cc"
+#include "f77-uscore.h"
 #include "lo-error.h"
-#include "f77-uscore.h"
+#include "mx-base.h"
+#include "mx-inlines.cc"
 
 // Fortran functions we call.
 
diff --git a/liboctave/dbleDET.cc b/liboctave/dbleDET.cc
--- a/liboctave/dbleDET.cc
+++ b/liboctave/dbleDET.cc
@@ -29,8 +29,8 @@
 #include <config.h>
 #endif
 
-#include <math.h>
-#include <float.h>
+#include <cfloat>
+#include <cmath>
 
 #include "dbleDET.h"
 
diff --git a/liboctave/dbleGEPBAL.cc b/liboctave/dbleGEPBAL.cc
--- a/liboctave/dbleGEPBAL.cc
+++ b/liboctave/dbleGEPBAL.cc
@@ -29,7 +29,7 @@
 #include <config.h>
 #endif
 
-#include <math.h>
+#include <cmath>
 
 #include "dbleGEPBAL.h"
 #include "f77-uscore.h"
diff --git a/liboctave/dbleQRP.cc b/liboctave/dbleQRP.cc
--- a/liboctave/dbleQRP.cc
+++ b/liboctave/dbleQRP.cc
@@ -29,12 +29,12 @@
 #include <config.h>
 #endif
 
-#include <assert.h>
+#include <cassert>
 
 #include "dbleQRP.h"
-#include "mx-inlines.cc"
+#include "f77-uscore.h"
 #include "lo-error.h"
-#include "f77-uscore.h"
+#include "mx-inlines.cc"
 
 extern "C"
 {
diff --git a/liboctave/sun-utils.cc b/liboctave/sun-utils.cc
--- a/liboctave/sun-utils.cc
+++ b/liboctave/sun-utils.cc
@@ -23,7 +23,7 @@
 
 #ifdef sun
 
-#include <assert.h>
+#include <cassert>
 
 // I think that this is really only needed if linking to Fortran
 // compiled libraries on a Sun.  It should never be called.
diff --git a/liboctave/utils.cc b/liboctave/utils.cc
--- a/liboctave/utils.cc
+++ b/liboctave/utils.cc
@@ -25,10 +25,13 @@
 #include <config.h>
 #endif
 
+#include <csignal>
+#include <cstdlib>
+
+#ifdef HAVE_UNISTD_H
 #include <sys/types.h>
 #include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
+#endif
 
 #include "f77-uscore.h"