Mercurial > octave-nkf
changeset 9786:2c279308f6ab
fix includes in some src/DLD-FUNCTIONS files
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 09 Nov 2009 12:12:57 -0500 |
| parents | ccad98db781b |
| children | cc5bb7b5679f |
| files | src/ChangeLog src/DLD-FUNCTIONS/__delaunayn__.cc src/DLD-FUNCTIONS/__dsearchn__.cc src/DLD-FUNCTIONS/__voronoi__.cc src/DLD-FUNCTIONS/convhulln.cc src/DLD-FUNCTIONS/qz.cc src/DLD-FUNCTIONS/tsearch.cc |
| diffstat | 7 files changed, 49 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 08 17:15:07 2009 -0500 +++ b/src/ChangeLog Mon Nov 09 12:12:57 2009 -0500 @@ -1,3 +1,10 @@ +2009-11-09 John W. Eaton <jwe@octave.org> + + * DLD-FUNCTIONS/__delaunayn__.cc, DLD-FUNCTIONS/__dsearchn__.cc, + DLD-FUNCTIONS/__voronoi__.cc, DLD-FUNCTIONS/convhulln.cc, + DLD-FUNCTIONS/qz.cc, DLD-FUNCTIONS/tsearch.cc: Correctly include + config.h, don't include oct.h, etc. + 2009-11-08 Jaroslav Hajek <highegg@gmail.com> * DLD-FUNCTIONS/bsxfun.cc: Add missing copyright.
--- a/src/DLD-FUNCTIONS/__delaunayn__.cc Sun Nov 08 17:15:07 2009 -0500 +++ b/src/DLD-FUNCTIONS/__delaunayn__.cc Mon Nov 09 12:12:57 2009 -0500 @@ -38,14 +38,17 @@ * change the default options (for compatibility with matlab) */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <iostream> #include <string> -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#include "oct.h" -#include "ov-cell.h" +#include "Cell.h" +#include "defun-dld.h" +#include "error.h" +#include "oct-obj.h" #ifdef HAVE_QHULL extern "C" {
--- a/src/DLD-FUNCTIONS/__dsearchn__.cc Sun Nov 08 17:15:07 2009 -0500 +++ b/src/DLD-FUNCTIONS/__dsearchn__.cc Mon Nov 09 12:12:57 2009 -0500 @@ -20,17 +20,19 @@ */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <iostream> #include <fstream> #include <string> -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "lo-math.h" -#include "lo-math.h" -//FIXME -- Octave sources should use individual include files, not oct.h. -#include "oct.h" +#include "defun-dld.h" +#include "error.h" +#include "oct-obj.h" DEFUN_DLD (__dsearchn__, args, , "-*- texinfo -*-\n\
--- a/src/DLD-FUNCTIONS/__voronoi__.cc Sun Nov 08 17:15:07 2009 -0500 +++ b/src/DLD-FUNCTIONS/__voronoi__.cc Mon Nov 09 12:12:57 2009 -0500 @@ -30,13 +30,18 @@ qhull command */ -#include <iostream> #ifdef HAVE_CONFIG_H #include <config.h> #endif + +#include <cstdio> + #include "lo-ieee.h" -#include "oct.h" + #include "Cell.h" +#include "defun-dld.h" +#include "error.h" +#include "oct-obj.h" #ifdef HAVE_QHULL extern "C" {
--- a/src/DLD-FUNCTIONS/convhulln.cc Sun Nov 08 17:15:07 2009 -0500 +++ b/src/DLD-FUNCTIONS/convhulln.cc Mon Nov 09 12:12:57 2009 -0500 @@ -29,13 +29,17 @@ * guaranteed to be simplicial. */ -#include <sstream> - #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include "oct.h" + +#include <sstream> + #include "Cell.h" +#include "defun-dld.h" +#include "error.h" +#include "oct-obj.h" +#include "parse.h" #ifdef HAVE_QHULL #if defined(HAVE__SNPRINTF) && !defined(HAVE_SNPRINTF)
--- a/src/DLD-FUNCTIONS/qz.cc Sun Nov 08 17:15:07 2009 -0500 +++ b/src/DLD-FUNCTIONS/qz.cc Mon Nov 09 12:12:57 2009 -0500 @@ -29,7 +29,9 @@ #undef DEBUG_SORT #undef DEBUG_EIG -#include "config.h" +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #include <cfloat>
--- a/src/DLD-FUNCTIONS/tsearch.cc Sun Nov 08 17:15:07 2009 -0500 +++ b/src/DLD-FUNCTIONS/tsearch.cc Mon Nov 09 12:12:57 2009 -0500 @@ -22,15 +22,22 @@ // Author: Andreas Stahel <Andreas.Stahel@hta-bi.bfh.ch> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <iostream> #include <fstream> #include <string> -#include "oct.h" -#include "parse.h" #include "lo-ieee.h" #include "lo-math.h" +#include "defun-dld.h" +#include "error.h" +#include "oct-obj.h" +#include "parse.h" + inline double max(double a, double b, double c) { if (a < b)