Mercurial > octave-nkf

changeset 15149:62a35ae7d6a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use forward decls for mxArray in ov.h and ov-base.h * ov.h, ov-base.h: Use forward decls for mxArray class instead of including mxarray.h. * ov-base-diag.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-intx.h, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-struct.cc, ov-bool-sparse.cc, ov-perm.cc: Include mxarray.h. #include "mach-info.h" * ov-bool-sparse.cc, ov-perm.cc: Include dim-vector.h
author John W. Eaton <jwe@octave.org>
date Fri, 10 Aug 2012 17:59:35 -0400
parents 1b2fbc30e4e7
children 2eb789da13c3 8bba043342ab
files src/interp-core/mex.cc src/octave-value/ov-base-diag.cc src/octave-value/ov-base.cc src/octave-value/ov-base.h src/octave-value/ov-bool-mat.cc src/octave-value/ov-bool-sparse.cc src/octave-value/ov-bool.cc src/octave-value/ov-cell.cc src/octave-value/ov-ch-mat.cc src/octave-value/ov-class.cc src/octave-value/ov-complex.cc src/octave-value/ov-cx-mat.cc src/octave-value/ov-cx-sparse.cc src/octave-value/ov-float.cc src/octave-value/ov-flt-complex.cc src/octave-value/ov-flt-cx-mat.cc src/octave-value/ov-flt-re-mat.cc src/octave-value/ov-intx.h src/octave-value/ov-perm.cc src/octave-value/ov-range.cc src/octave-value/ov-re-mat.cc src/octave-value/ov-re-sparse.cc src/octave-value/ov-scalar.cc src/octave-value/ov-struct.cc src/octave-value/ov.h
diffstat 25 files changed, 29 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/interp-core/mex.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/interp-core/mex.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -35,9 +35,9 @@
 #include "lo-ieee.h"
 #include "oct-locbuf.h"
 
+#include "Cell.h"
 // mxArray must be declared as a class before including mexproto.h.
-class mxArray;
-#include "Cell.h"
+#include "mxarray.h"
 #include "mexproto.h"
 #include "oct-map.h"
 #include "oct-obj.h"
--- a/src/octave-value/ov-base-diag.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-base-diag.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -29,6 +29,7 @@
 #include "mach-info.h"
 #include "lo-ieee.h"
 
+#include "mxarray.h"
 #include "ov-base.h"
 #include "ov-base-mat.h"
 #include "pr-output.h"
--- a/src/octave-value/ov-base.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-base.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -34,6 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-map.h"
 #include "oct-obj.h"
 #include "oct-lvalue.h"
--- a/src/octave-value/ov-base.h	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-base.h	Fri Aug 10 17:59:35 2012 -0400
@@ -32,7 +32,6 @@
 
 #include "Range.h"
 #include "data-conv.h"
-#include "mxarray.h"
 #include "mx-base.h"
 #include "str-vec.h"
 
@@ -40,6 +39,7 @@
 #include "oct-hdf5.h"
 
 class Cell;
+class mxArray;
 class octave_map;
 class octave_scalar_map;
 class octave_value;
--- a/src/octave-value/ov-bool-mat.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-bool-mat.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -34,6 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "ops.h"
 #include "ov-base.h"
--- a/src/octave-value/ov-bool-sparse.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-bool-sparse.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -30,6 +30,9 @@
 #include <iostream>
 #include <vector>
 
+#include "dim-vector.h"
+
+#include "mxarray.h"
 #include "ov-base.h"
 #include "ov-scalar.h"
 #include "ov-bool.h"
--- a/src/octave-value/ov-bool.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-bool.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -29,6 +29,7 @@
 #include "mx-base.h"
 
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "ops.h"
 #include "ov-bool.h"
--- a/src/octave-value/ov-cell.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-cell.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -39,6 +39,7 @@
 
 #include "defun.h"
 #include "error.h"
+#include "mxarray.h"
 #include "ov-cell.h"
 #include "oct-obj.h"
 #include "unwind-prot.h"
--- a/src/octave-value/ov-ch-mat.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-ch-mat.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -31,6 +31,7 @@
 #include "lo-ieee.h"
 #include "mx-base.h"
 
+#include "mxarray.h"
 #include "ov-base.h"
 #include "ov-base-mat.h"
 #include "ov-base-mat.cc"
--- a/src/octave-value/ov-class.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-class.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -42,6 +42,7 @@
 #include "ls-oct-ascii.h"
 #include "ls-oct-binary.h"
 #include "ls-utils.h"
+#include "mxarray.h"
 #include "oct-lvalue.h"
 #include "ov-class.h"
 #include "ov-fcn.h"
--- a/src/octave-value/ov-complex.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-complex.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -30,6 +30,7 @@
 #include "lo-specfun.h"
 #include "lo-mappers.h"
 
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
--- a/src/octave-value/ov-cx-mat.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-cx-mat.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -37,6 +37,7 @@
 #include "oct-locbuf.h"
 
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
--- a/src/octave-value/ov-cx-sparse.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-cx-sparse.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -34,6 +34,7 @@
 #include "lo-mappers.h"
 #include "oct-locbuf.h"
 
+#include "mxarray.h"
 #include "ov-base.h"
 #include "ov-scalar.h"
 #include "ov-complex.h"
--- a/src/octave-value/ov-float.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-float.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -33,6 +33,7 @@
 
 #include "defun.h"
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "oct-stream.h"
 #include "ov-scalar.h"
--- a/src/octave-value/ov-flt-complex.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-flt-complex.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -30,6 +30,7 @@
 #include "lo-specfun.h"
 #include "lo-mappers.h"
 
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
--- a/src/octave-value/ov-flt-cx-mat.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-flt-cx-mat.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -37,6 +37,7 @@
 #include "oct-locbuf.h"
 
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "oct-stream.h"
 #include "ops.h"
--- a/src/octave-value/ov-flt-re-mat.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-flt-re-mat.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -42,6 +42,7 @@
 
 #include "defun.h"
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "oct-lvalue.h"
 #include "oct-stream.h"
--- a/src/octave-value/ov-intx.h	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-intx.h	Fri Aug 10 17:59:35 2012 -0400
@@ -31,6 +31,7 @@
 #include "str-vec.h"
 
 #include "error.h"
+#include "mxarray.h"
 #include "oct-stream.h"
 #include "ov-base.h"
 #include "ov-base-int.h"
--- a/src/octave-value/ov-perm.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-perm.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -25,7 +25,9 @@
 #endif
 
 #include "byte-swap.h"
+#include "dim-vector.h"
 
+#include "mxarray.h"
 #include "ov-perm.h"
 #include "ov-re-mat.h"
 #include "ov-scalar.h"
--- a/src/octave-value/ov-range.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-range.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -32,6 +32,7 @@
 #include "defun.h"
 #include "variables.h"
 #include "gripes.h"
+#include "mxarray.h"
 #include "ops.h"
 #include "oct-obj.h"
 #include "ov-range.h"
--- a/src/octave-value/ov-re-mat.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-re-mat.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -42,6 +42,7 @@
 
 #include "defun.h"
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "oct-lvalue.h"
 #include "oct-stream.h"
--- a/src/octave-value/ov-re-sparse.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-re-sparse.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -34,6 +34,7 @@
 #include "lo-mappers.h"
 #include "oct-locbuf.h"
 
+#include "mxarray.h"
 #include "ov-base.h"
 #include "ov-scalar.h"
 #include "gripes.h"
--- a/src/octave-value/ov-scalar.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-scalar.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -33,6 +33,7 @@
 
 #include "defun.h"
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-obj.h"
 #include "oct-stream.h"
 #include "ov-scalar.h"
--- a/src/octave-value/ov-struct.cc	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov-struct.cc	Fri Aug 10 17:59:35 2012 -0400
@@ -30,6 +30,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
+#include "mxarray.h"
 #include "oct-lvalue.h"
 #include "ov-struct.h"
 #include "unwind-prot.h"
--- a/src/octave-value/ov.h	Fri Aug 10 16:41:07 2012 -0500
+++ b/src/octave-value/ov.h	Fri Aug 10 17:59:35 2012 -0400
@@ -34,7 +34,6 @@
 #include "data-conv.h"
 #include "idx-vector.h"
 #include "mach-info.h"
-#include "mxarray.h"
 #include "mx-base.h"
 #include "oct-alloc.h"
 #include "oct-time.h"
@@ -44,6 +43,7 @@
 #include "oct-sort.h"
 
 class Cell;
+class mxArray;
 class octave_map;
 class octave_scalar_map;
 class Octave_map;