--- a/build-aux/mk-opts.pl	Fri Dec 18 15:37:22 2015 -0800
+++ b/build-aux/mk-opts.pl	Fri Dec 18 16:04:56 2015 -0800
@@ -519,7 +519,7 @@
 #include "defun.h"
 #include "pr-output.h"
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 #include "pager.h"
 

--- a/libgui/graphics/annotation-dialog.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libgui/graphics/annotation-dialog.h	Fri Dec 18 16:04:56 2015 -0800
@@ -27,7 +27,7 @@
 #include <QLineEdit>
 #include <QAbstractButton>
 
-#include "oct-obj.h"
+#include "ovl.h"
 
 namespace Ui
 {

--- a/libinterp/corefcn/Cell.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/Cell.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -30,7 +30,7 @@
 #include "Cell.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 Cell::Cell (const octave_value_list& ovl)
   : Array<octave_value> (ovl.cell_value ())

--- a/libinterp/corefcn/__contourc__.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/__contourc__.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -42,7 +42,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 // FIXME: this looks like trouble...
 static Matrix this_contour;

--- a/libinterp/corefcn/__dsearchn__.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/__dsearchn__.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -32,7 +32,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 DEFUN (__dsearchn__, args, ,
        "-*- texinfo -*-\n\

--- a/libinterp/corefcn/__lin_interpn__.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/__lin_interpn__.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -30,7 +30,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 // equivalent to isvector.m
 

--- a/libinterp/corefcn/__pchip_deriv__.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/__pchip_deriv__.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -28,7 +28,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 #include "f77-fcn.h"
 

--- a/libinterp/corefcn/__qp__.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/__qp__.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pr-output.h"
 #include "utils.h"
 

--- a/libinterp/corefcn/balance.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/balance.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -43,7 +43,7 @@
 #include "error.h"
 #include "f77-fcn.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN (balance, args, nargout,

--- a/libinterp/corefcn/besselj.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/besselj.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 enum bessel_type

--- a/libinterp/corefcn/betainc.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/betainc.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 

--- a/libinterp/corefcn/colloc.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/colloc.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -31,7 +31,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN (colloc, args, ,

--- a/libinterp/corefcn/conv2.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/conv2.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 enum Shape { SHAPE_FULL, SHAPE_SAME, SHAPE_VALID };

--- a/libinterp/corefcn/daspk.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/daspk.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-fcn.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/dasrt.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/dasrt.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -33,7 +33,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-fcn.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/dassl.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/dassl.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-fcn.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/data.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/data.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -53,7 +53,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "ov-class.h"
 #include "ov-float.h"

--- a/libinterp/corefcn/debug.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/debug.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -40,7 +40,7 @@
 #include "input.h"
 #include "pager.h"
 #include "octave-link.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 #include "parse.h"
 #include "symtab.h"

--- a/libinterp/corefcn/defaults.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/defaults.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -47,7 +47,7 @@
 #include "help.h"
 #include "input.h"
 #include "load-path.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "parse.h"
 #include "toplev.h"

--- a/libinterp/corefcn/defun.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/defun.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -38,7 +38,7 @@
 #include "ov-fcn.h"
 #include "ov-mex-fcn.h"
 #include "ov-usr-fcn.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "pager.h"
 #include "symtab.h"

--- a/libinterp/corefcn/det.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/det.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 #include "ops.h"
 

--- a/libinterp/corefcn/dirfns.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/dirfns.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -52,7 +52,7 @@
 #include "input.h"
 #include "load-path.h"
 #include "octave-link.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pager.h"
 #include "procstream.h"
 #include "sysdep.h"

--- a/libinterp/corefcn/dlmread.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/dlmread.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -38,7 +38,7 @@
 #include "defun.h"
 #include "oct-stream.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 static const octave_idx_type idx_max =

--- a/libinterp/corefcn/eig.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/eig.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -30,7 +30,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN (eig, args, nargout,

--- a/libinterp/corefcn/error.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/error.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -36,7 +36,7 @@
 #include "error.h"
 #include "input.h"
 #include "pager.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "utils.h"
 #include "ov.h"

--- a/libinterp/corefcn/fft.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/fft.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -30,7 +30,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 #if defined (HAVE_FFTW)

--- a/libinterp/corefcn/fft2.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/fft2.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -30,7 +30,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 // This function should be merged with Fifft.

--- a/libinterp/corefcn/fftn.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/fftn.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 // This function should be merged with Fifft.

--- a/libinterp/corefcn/file-io.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/file-io.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -67,7 +67,7 @@
 #include "oct-fstrm.h"
 #include "oct-iostrm.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-prcstrm.h"
 #include "oct-stream.h"
 #include "oct-strstrm.h"

--- a/libinterp/corefcn/filter.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/filter.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -36,7 +36,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 #if ! defined (CXX_NEW_FRIEND_TEMPLATE_DECL)
 extern MArray<double>

--- a/libinterp/corefcn/find.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/find.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 // Find at most N_TO_FIND nonzero elements in NDA.  Search forward if
 // DIRECTION is 1, backward if it is -1.  NARGOUT is the number of

--- a/libinterp/corefcn/gammainc.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/gammainc.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN (gammainc, args, ,

--- a/libinterp/corefcn/gcd.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/gcd.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 static double
 simple_gcd (double a, double b)

--- a/libinterp/corefcn/getgrent.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/getgrent.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 #include "gripes.h"
 #include "oct-map.h"
 #include "ov.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 // Group file functions.  (Why not?)

--- a/libinterp/corefcn/getpwent.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/getpwent.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 #include "gripes.h"
 #include "oct-map.h"
 #include "ov.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 // Password file functions.  (Why not?)

--- a/libinterp/corefcn/getrusage.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/getrusage.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -40,7 +40,7 @@
 #include "oct-map.h"
 #include "sysdep.h"
 #include "ov.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 #if ! defined (HZ)

--- a/libinterp/corefcn/givens.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/givens.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -28,7 +28,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 DEFUN (givens, args, nargout,
        "-*- texinfo -*-\n\

--- a/libinterp/corefcn/graphics.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/graphics.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -49,7 +49,7 @@
 #include "graphics.h"
 #include "input.h"
 #include "ov.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-fcn-handle.h"
 #include "pager.h"

--- a/libinterp/corefcn/gripes.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/gripes.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -27,7 +27,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 void

--- a/libinterp/corefcn/help.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/help.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -51,7 +51,7 @@
 #include "help.h"
 #include "input.h"
 #include "load-path.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-usr-fcn.h"
 #include "pager.h"
 #include "parse.h"

--- a/libinterp/corefcn/hess.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/hess.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -32,7 +32,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN (hess, args, nargout,

--- a/libinterp/corefcn/hex2num.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/hex2num.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN (hex2num, args, ,

--- a/libinterp/corefcn/hook-fcn.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/hook-fcn.h	Fri Dec 18 16:04:56 2015 -0800
@@ -25,7 +25,7 @@
 
 #include <string>
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "ov-fcn-handle.h"
 #include "parse.h"

--- a/libinterp/corefcn/input.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/input.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -58,7 +58,7 @@
 #include "oct-hist.h"
 #include "toplev.h"
 #include "octave-link.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-fcn-handle.h"
 #include "pager.h"
 #include "parse.h"

--- a/libinterp/corefcn/input.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/input.h	Fri Dec 18 16:04:56 2015 -0800
@@ -30,7 +30,7 @@
 #include <string>
 
 #include "oct-time.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pager.h"
 
 class octave_value;

--- a/libinterp/corefcn/inv.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/inv.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -27,7 +27,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ops.h"
 #include "ov-re-diag.h"
 #include "ov-cx-diag.h"

--- a/libinterp/corefcn/kron.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/kron.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -46,7 +46,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 template <class R, class T>
 static MArray<T>

--- a/libinterp/corefcn/load-save.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/load-save.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -60,7 +60,7 @@
 #include "load-path.h"
 #include "load-save.h"
 #include "oct-hdf5.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/lookup.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/lookup.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -37,7 +37,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 
 static

--- a/libinterp/corefcn/ls-hdf5.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/ls-hdf5.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -56,7 +56,7 @@
 #include "gripes.h"
 #include "load-save.h"
 #include "oct-hdf5.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/ls-mat-ascii.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/ls-mat-ascii.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -53,7 +53,7 @@
 #include "load-save.h"
 #include "ls-ascii-helper.h"
 #include "ls-mat-ascii.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/ls-mat4.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/ls-mat4.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -51,7 +51,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "load-save.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/ls-mat5.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/ls-mat5.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -56,7 +56,7 @@
 #include "gripes.h"
 #include "load-save.h"
 #include "load-path.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-cell.h"
 #include "ov-class.h"

--- a/libinterp/corefcn/ls-oct-binary.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/ls-oct-binary.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -51,7 +51,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "load-save.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/ls-oct-text.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/ls-oct-text.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -53,7 +53,7 @@
 #include "load-save.h"
 #include "ls-ascii-helper.h"
 #include "ls-oct-text.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/lsode.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/lsode.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-fcn.h"
 #include "ov-cell.h"
 #include "pager.h"

--- a/libinterp/corefcn/lu.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/lu.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 #include "ov-re-sparse.h"
 #include "ov-cx-sparse.h"

--- a/libinterp/corefcn/luinc.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/luinc.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -27,7 +27,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 #include "oct-map.h"
 

--- a/libinterp/corefcn/max.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/max.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 #include "ov-cx-mat.h"
 #include "ov-re-sparse.h"

--- a/libinterp/corefcn/mex.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/mex.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -40,7 +40,7 @@
 #include "mxarray.h"
 #include "mexproto.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "ov-mex-fcn.h"
 #include "ov-usr-fcn.h"

--- a/libinterp/corefcn/module.mk	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/module.mk	Fri Dec 18 16:04:56 2015 -0800
@@ -197,7 +197,6 @@
   libinterp/corefcn/oct-iostrm.cc \
   libinterp/corefcn/oct-lvalue.cc \
   libinterp/corefcn/oct-map.cc \
-  libinterp/corefcn/oct-obj.cc \
   libinterp/corefcn/oct-prcstrm.cc \
   libinterp/corefcn/oct-procbuf.cc \
   libinterp/corefcn/oct-stream.cc \

--- a/libinterp/corefcn/oct-hist.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/oct-hist.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -59,7 +59,7 @@
 #include "gripes.h"
 #include "input.h"
 #include "oct-hist.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pager.h"
 #include "parse.h"
 #include "sighandlers.h"

--- a/libinterp/corefcn/oct-lvalue.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/oct-lvalue.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -25,7 +25,7 @@
 #endif
 
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "ov.h"
 

--- a/libinterp/corefcn/oct-lvalue.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/oct-lvalue.h	Fri Dec 18 16:04:56 2015 -0800
@@ -28,7 +28,7 @@
 
 #include <string>
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pt-idx.h"
 #include "symtab.h"
 

--- a/libinterp/corefcn/oct-map.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/oct-map.h	Fri Dec 18 16:04:56 2015 -0800
@@ -28,7 +28,7 @@
 #include <map>
 
 #include "Cell.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 class string_vector;
 

--- a/libinterp/corefcn/oct-obj.cc	Fri Dec 18 15:37:22 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-/*
-
-Copyright (C) 1994-2015 John W. Eaton
-Copyright (C) 2009 VZLU Prague
-
-This file is part of Octave.
-
-Octave is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 3 of the License, or (at your
-option) any later version.
-
-Octave is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with Octave; see the file COPYING.  If not, see
-<http://www.gnu.org/licenses/>.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "error.h"
-#include "oct-obj.h"
-#include "Cell.h"
-
-// We are likely to have a lot of octave_value_list objects to allocate,
-// so make the grow_size large.
-
-octave_value_list::octave_value_list (const std::list<octave_value_list>& lst)
-{
-  octave_idx_type n = 0;
-  octave_idx_type nel = 0;
-
-  // Determine number.
-  for (std::list<octave_value_list>::const_iterator p = lst.begin ();
-       p != lst.end (); p++)
-    {
-      n++;
-      nel += p->length ();
-    }
-
-  // Optimize single-element case
-  if (n == 1)
-    data = lst.front ().data;
-  else if (nel > 0)
-    {
-      data.resize (dim_vector (1, nel));
-      octave_idx_type k = 0;
-      for (std::list<octave_value_list>::const_iterator p = lst.begin ();
-           p != lst.end (); p++)
-        {
-          data.assign (idx_vector (k, k + p->length ()), p->data);
-          k += p->length ();
-        }
-      assert (k == nel);
-    }
-
-}
-
-octave_value_list&
-octave_value_list::prepend (const octave_value& val)
-{
-  octave_idx_type n = length ();
-
-  resize (n + 1);
-
-  while (n > 0)
-    {
-      elem (n) = elem (n - 1);
-      n--;
-    }
-
-  elem (0) = val;
-
-  return *this;
-}
-
-octave_value_list&
-octave_value_list::append (const octave_value& val)
-{
-  octave_idx_type n = length ();
-
-  resize (n + 1);
-
-  elem (n) = val;
-
-  return *this;
-}
-
-octave_value_list&
-octave_value_list::append (const octave_value_list& lst)
-{
-  octave_idx_type len = length ();
-  octave_idx_type lst_len = lst.length ();
-
-  resize (len + lst_len);
-
-  for (octave_idx_type i = 0; i < lst_len; i++)
-    elem (len + i) = lst (i);
-
-  return *this;
-}
-
-octave_value_list&
-octave_value_list::reverse (void)
-{
-  octave_idx_type n = length ();
-
-  for (octave_idx_type i = 0; i < n / 2; i++)
-    {
-      octave_value tmp = elem (i);
-      elem (i) = elem (n - i - 1);
-      elem (n - i - 1) = tmp;
-    }
-
-  return *this;
-}
-
-octave_value_list
-octave_value_list::splice (octave_idx_type offset, octave_idx_type rep_length,
-                           const octave_value_list& lst) const
-{
-  octave_value_list retval;
-
-  octave_idx_type len = length ();
-
-  if (offset < 0 || offset >= len)
-    {
-      if (! (rep_length == 0 && offset == len))
-        error ("octave_value_list::splice: invalid OFFSET");
-    }
-
-  if (rep_length < 0 || rep_length + offset > len)
-    error ("octave_value_list::splice: invalid LENGTH");
-
-  octave_idx_type lst_len = lst.length ();
-
-  octave_idx_type new_len = len - rep_length + lst_len;
-
-  retval.resize (new_len);
-
-  octave_idx_type k = 0;
-
-  for (octave_idx_type i = 0; i < offset; i++)
-    retval(k++) = elem (i);
-
-  for (octave_idx_type i = 0; i < lst_len; i++)
-    retval(k++) = lst (i);
-
-  for (octave_idx_type i = offset + rep_length; i < len; i++)
-    retval(k++) = elem (i);
-
-  return retval;
-}
-
-bool
-octave_value_list::all_strings_p (void) const
-{
-  octave_idx_type n = length ();
-
-  for (octave_idx_type i = 0; i < n; i++)
-    if (! elem(i).is_string ())
-      return false;
-
-  return true;
-}
-
-bool
-octave_value_list::all_scalars (void) const
-{
-  octave_idx_type n = length ();
-
-  for (octave_idx_type i = 0; i < n; i++)
-    {
-      dim_vector dv = elem(i).dims ();
-      if (! dv.all_ones ())
-        return false;
-    }
-
-  return true;
-}
-
-bool
-octave_value_list::any_cell (void) const
-{
-  octave_idx_type n = length ();
-
-  for (octave_idx_type i = 0; i < n; i++)
-    if (elem (i).is_cell ())
-      return true;
-
-  return false;
-}
-
-bool
-octave_value_list::has_magic_colon (void) const
-{
-  octave_idx_type n = length ();
-
-  for (octave_idx_type i = 0; i < n; i++)
-    if (elem(i).is_magic_colon ())
-      return true;
-
-  return false;
-}
-
-string_vector
-octave_value_list::make_argv (const std::string& fcn_name) const
-{
-  string_vector argv;
-
-  if (all_strings_p ())
-    {
-      octave_idx_type len = length ();
-
-      octave_idx_type total_nr = 0;
-
-      for (octave_idx_type i = 0; i < len; i++)
-        {
-          // An empty std::string ("") has zero columns and zero rows (a
-          // change that was made for Matlab contemptibility.
-
-          octave_idx_type n = elem(i).rows ();
-
-          total_nr += n ? n : 1;
-        }
-
-      octave_idx_type k = 0;
-      if (! fcn_name.empty ())
-        {
-          argv.resize (total_nr+1);
-          argv[0] = fcn_name;
-          k = 1;
-        }
-      else
-        argv.resize (total_nr);
-
-      for (octave_idx_type i = 0; i < len; i++)
-        {
-          octave_idx_type nr = elem(i).rows ();
-
-          if (nr < 2)
-            argv[k++] = elem(i).string_value ();
-          else
-            {
-              string_vector tmp = elem(i).all_strings ();
-
-              for (octave_idx_type j = 0; j < nr; j++)
-                argv[k++] = tmp[j];
-            }
-        }
-    }
-  else
-    error ("%s: all arguments must be strings", fcn_name.c_str ());
-
-  return argv;
-}
-
-void
-octave_value_list::make_storable_values (void)
-{
-  octave_idx_type len = length ();
-  const Array<octave_value>& cdata = data;
-
-  for (octave_idx_type i = 0; i < len; i++)
-    {
-      // This is optimized so that we don't force a copy unless necessary.
-      octave_value tmp = cdata(i).storable_value ();
-      if (! tmp.is_copy_of (cdata (i)))
-        data(i) = tmp;
-    }
-}

--- a/libinterp/corefcn/oct-obj.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/oct-obj.h	Fri Dec 18 16:04:56 2015 -0800
@@ -1,7 +1,6 @@
 /*
 
-Copyright (C) 1994-2015 John W. Eaton
-Copyright (C) 2009 VZLU Prague
+Copyright (C) 2015 Rik Wehbring
 
 This file is part of Octave.
 
@@ -21,302 +20,11 @@
 
 */
 
-#if ! defined (octave_oct_obj_h)
-#define octave_oct_obj_h 1
-
-#include <string>
-#include <vector>
-
-#include "str-vec.h"
-#include "Array.h"
-
-#include "ov.h"
-#include "Cell.h"
-
-class
-OCTINTERP_API
-octave_value_list
-{
-public:
-
-  octave_value_list (void)
-    : data (), names () { }
-
-  explicit octave_value_list (octave_idx_type n)
-    : data (dim_vector (1, n)), names () { }
-
-  octave_value_list (octave_idx_type n, const octave_value& val)
-    : data (dim_vector (1, n), val), names () { }
-
-  octave_value_list (const octave_value& tc)
-    : data (dim_vector (1, 1), tc), names () { }
-
-  octave_value_list (const Array<octave_value>& d)
-    : data (d.as_row ()), names () { }
-
-  octave_value_list (const Cell& tc)
-    : data (tc.as_row ()), names () { }
-
-  octave_value_list (const octave_value_list& obj)
-    : data (obj.data), names (obj.names) { }
-
-  // Concatenation constructor.
-  octave_value_list (const std::list<octave_value_list>&);
-
-  ~octave_value_list (void) { }
-
-  octave_value_list& operator = (const octave_value_list& obj)
-  {
-    if (this != &obj)
-      {
-        data = obj.data;
-        names = obj.names;
-      }
-
-    return *this;
-  }
-
-  Array<octave_value> array_value (void) const { return data; }
-
-  Cell cell_value (void) const { return array_value (); }
-
-  // Assignment will resize on range errors.
-
-  octave_value& operator () (octave_idx_type n) { return elem (n); }
-
-  const octave_value& operator () (octave_idx_type n) const { return elem (n); }
-
-  octave_idx_type length (void) const { return data.numel (); }
-
-  bool empty (void) const { return length () == 0; }
-
-  void resize (octave_idx_type n, const octave_value& rfv = octave_value ())
-  {
-    data.resize (dim_vector (1, n), rfv);
-  }
-
-  octave_value_list& prepend (const octave_value& val);
-
-  octave_value_list& append (const octave_value& val);
-
-  octave_value_list& append (const octave_value_list& lst);
-
-  octave_value_list& reverse (void);
-
-  octave_value_list
-  slice (octave_idx_type offset, octave_idx_type len, bool tags = false) const
-  {
-    // linear_slice uses begin/end indices instead of offset and
-    // length.  Avoid calling with upper bound out of range.
-    // linear_slice handles the case of len < 0.
-
-    octave_value_list retval
-      = data.linear_slice (offset, std::min (offset + len, length ()));
-
-    if (tags && len > 0 && names.numel () > 0)
-      retval.names = names.linear_slice (offset, std::min (offset + len,
-                                                           names.numel ()));
-
-    return retval;
-  }
-
-  octave_value_list
-  splice (octave_idx_type offset, octave_idx_type len,
-          const octave_value_list& lst = octave_value_list ()) const;
-
-  bool all_strings_p (void) const;
-
-  bool all_scalars (void) const;
-
-  bool any_cell (void) const;
-
-  bool has_magic_colon (void) const;
-
-  string_vector make_argv (const std::string& = std::string ()) const;
-
-  void stash_name_tags (const string_vector& nm) { names = nm; }
-
-  string_vector name_tags (void) const { return names; }
-
-  void make_storable_values (void);
-
-  octave_value& xelem (octave_idx_type i)
-  {
-    return data.xelem (i);
-  }
-
-  void clear (void)
-  {
-    data.clear ();
-  }
-
-private:
-
-  Array<octave_value> data;
-
-  // This list of strings can be used to tag each element of data with
-  // a name.  By default, it is empty.
-  string_vector names;
-
-  octave_value& elem (octave_idx_type n)
-  {
-    if (n >= length ())
-      resize (n + 1);
-
-    return data(n);
-  }
-
-  const octave_value& elem (octave_idx_type n) const
-  { return data(n); }
-
-};
+////////////////////////////////////////////////////////////////////////////////
+// oct-obj.h was deprecated in version 4.2 and will be removed in version 4.6.
+////////////////////////////////////////////////////////////////////////////////
 
-// Make it easy to build argument lists for built-in functions or for
-// returning values.
-
-inline octave_value_list
-ovl (const octave_value& a0)
-{
-  octave_value_list retval (1);
-  retval(0) = a0;
-  return retval;
-}
-
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1)
-{
-  octave_value_list retval (2);
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
-
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1,
-     const octave_value& a2)
-{
-  octave_value_list retval (3);
-  retval(2) = a2;
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
-
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1,
-     const octave_value& a2, const octave_value& a3)
-{
-  octave_value_list retval (4);
-  retval(3) = a3;
-  retval(2) = a2;
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
-
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1,
-     const octave_value& a2, const octave_value& a3,
-     const octave_value& a4)
-{
-  octave_value_list retval (5);
-  retval(4) = a4;
-  retval(3) = a3;
-  retval(2) = a2;
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
-
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1,
-     const octave_value& a2, const octave_value& a3,
-     const octave_value& a4, const octave_value& a5)
-{
-  octave_value_list retval (6);
-  retval(5) = a5;
-  retval(4) = a4;
-  retval(3) = a3;
-  retval(2) = a2;
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
+#warning oct-obj.h has been deprecated; use ovl.h instead
 
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1,
-     const octave_value& a2, const octave_value& a3,
-     const octave_value& a4, const octave_value& a5,
-     const octave_value& a6)
-{
-  octave_value_list retval (7);
-  retval(6) = a6;
-  retval(5) = a5;
-  retval(4) = a4;
-  retval(3) = a3;
-  retval(2) = a2;
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
-
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1,
-     const octave_value& a2, const octave_value& a3,
-     const octave_value& a4, const octave_value& a5,
-     const octave_value& a6, const octave_value& a7)
-{
-  octave_value_list retval (8);
-  retval(7) = a7;
-  retval(6) = a6;
-  retval(5) = a5;
-  retval(4) = a4;
-  retval(3) = a3;
-  retval(2) = a2;
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
+#include "ovl.h" 
 
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1,
-     const octave_value& a2, const octave_value& a3,
-     const octave_value& a4, const octave_value& a5,
-     const octave_value& a6, const octave_value& a7,
-     const octave_value& a8)
-{
-  octave_value_list retval (9);
-  retval(8) = a8;
-  retval(7) = a7;
-  retval(6) = a6;
-  retval(5) = a5;
-  retval(4) = a4;
-  retval(3) = a3;
-  retval(2) = a2;
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
-
-inline octave_value_list
-ovl (const octave_value& a0, const octave_value& a1,
-     const octave_value& a2, const octave_value& a3,
-     const octave_value& a4, const octave_value& a5,
-     const octave_value& a6, const octave_value& a7,
-     const octave_value& a8, const octave_value& a9)
-{
-  octave_value_list retval (10);
-  retval(9) = a9;
-  retval(8) = a8;
-  retval(7) = a7;
-  retval(6) = a6;
-  retval(5) = a5;
-  retval(4) = a4;
-  retval(3) = a3;
-  retval(2) = a2;
-  retval(1) = a1;
-  retval(0) = a0;
-  return retval;
-}
-
-#endif

--- a/libinterp/corefcn/oct-stream.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/oct-stream.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -49,7 +49,7 @@
 #include "input.h"
 #include "oct-stdstrm.h"
 #include "oct-stream.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "toplev.h"
 #include "utils.h"
 

--- a/libinterp/corefcn/oct.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/oct.h	Fri Dec 18 16:04:56 2015 -0800
@@ -37,7 +37,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "help.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pager.h"
 #include "utils.h"
 #include "variables.h"

--- a/libinterp/corefcn/ordschur.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/ordschur.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -26,7 +26,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "f77-fcn.h"
 
 extern "C"

--- a/libinterp/corefcn/pager.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/pager.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -37,7 +37,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "input.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pager.h"
 #include "procstream.h"
 #include "sighandlers.h"

--- a/libinterp/corefcn/pinv.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/pinv.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -27,7 +27,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 #include "ops.h"
 #include "ov-re-diag.h"

--- a/libinterp/corefcn/pr-output.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/pr-output.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -49,7 +49,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-stream.h"
 #include "octave-preserve-stream-state.h"
 #include "pager.h"

--- a/libinterp/corefcn/quad.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/quad.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -36,7 +36,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "pager.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-fcn.h"
 #include "unwind-prot.h"
 #include "utils.h"

--- a/libinterp/corefcn/quadcc.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/quadcc.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "parse.h"
 #include "utils.h"
 #include "variables.h"

--- a/libinterp/corefcn/qz.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/qz.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -47,7 +47,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov.h"
 #include "pager.h"

--- a/libinterp/corefcn/rand.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/rand.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -42,7 +42,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "unwind-prot.h"
 #include "utils.h"
 #include "ov-re-mat.h"

--- a/libinterp/corefcn/rcond.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/rcond.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -27,7 +27,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN (rcond, args, ,

--- a/libinterp/corefcn/regexp.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/regexp.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -41,7 +41,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 // Replace backslash escapes in a string with the real values.  We need

--- a/libinterp/corefcn/schur.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/schur.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 template <class Matrix>

--- a/libinterp/corefcn/sparse-xpow.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/sparse-xpow.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "quit.h"
 
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 #include "dSparse.h"

--- a/libinterp/corefcn/strfns.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/strfns.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -36,7 +36,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "ov.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "unwind-prot.h"
 #include "utils.h"
 

--- a/libinterp/corefcn/sub2ind.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/sub2ind.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -31,7 +31,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 
 static dim_vector

--- a/libinterp/corefcn/svd.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/svd.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -32,7 +32,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pr-output.h"
 #include "utils.h"
 #include "variables.h"

--- a/libinterp/corefcn/sylvester.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/sylvester.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN (sylvester, args, ,

--- a/libinterp/corefcn/symtab.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/symtab.h	Fri Dec 18 16:04:56 2015 -0800
@@ -36,7 +36,7 @@
 class tree_argument_list;
 class octave_user_function;
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "workspace-element.h"
 #include "oct-refcount.h"
 #include "ov.h"

--- a/libinterp/corefcn/syscalls.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/syscalls.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -51,7 +51,7 @@
 #include "lo-utils.h"
 #include "oct-hist.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-stdstrm.h"
 #include "oct-stream.h"
 #include "sysdep.h"

--- a/libinterp/corefcn/sysdep.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/sysdep.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -74,7 +74,7 @@
 #include "display.h"
 #include "error.h"
 #include "input.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "pager.h"
 #include "parse.h"

--- a/libinterp/corefcn/time.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/time.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -31,7 +31,7 @@
 #include "oct-map.h"
 #include "oct-time.h"
 #include "ov.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 // Date and time functions.
 

--- a/libinterp/corefcn/toplev.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/toplev.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -63,7 +63,7 @@
 #include "oct-conf-features.h"
 #include "oct-hist.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "pager.h"
 #include "parse.h"

--- a/libinterp/corefcn/tril.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/tril.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 // The bulk of the work.
 template <class T>

--- a/libinterp/corefcn/tsearch.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/tsearch.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -31,7 +31,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 inline double max (double a, double b, double c)
 {

--- a/libinterp/corefcn/typecast.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/typecast.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -32,7 +32,7 @@
 #include "defun.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "unwind-prot.h"
 
 static dim_vector

--- a/libinterp/corefcn/urlwrite.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/urlwrite.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -45,7 +45,7 @@
 
 #include "defun.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-cell.h"
 #include "pager.h"
 #include "oct-map.h"

--- a/libinterp/corefcn/utils.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/utils.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -61,7 +61,7 @@
 #include "load-path.h"
 #include "oct-errno.h"
 #include "oct-hist.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-range.h"
 #include "pager.h"
 #include "parse.h"

--- a/libinterp/corefcn/variables.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/variables.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -52,7 +52,7 @@
 #include "octave-link.h"
 #include "octave-preserve-stream-state.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "ov-class.h"
 #include "ov-usr-fcn.h"

--- a/libinterp/corefcn/xpow.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/corefcn/xpow.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -48,7 +48,7 @@
 #include "quit.h"
 
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 #include "xpow.h"
 

--- a/libinterp/dldfcn/__delaunayn__.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/__delaunayn__.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -50,7 +50,7 @@
 #include "Cell.h"
 #include "defun-dld.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "unwind-prot.h"
 
 #if defined (HAVE_QHULL)

--- a/libinterp/dldfcn/__glpk__.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/__glpk__.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "pager.h"
 
 #if defined (HAVE_GLPK)

--- a/libinterp/dldfcn/__voronoi__.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/__voronoi__.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -44,7 +44,7 @@
 #include "Cell.h"
 #include "defun-dld.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "unwind-prot.h"
 
 #if defined (HAVE_QHULL)

--- a/libinterp/dldfcn/audiodevinfo.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/audiodevinfo.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -36,7 +36,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "oct-locbuf.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "ov-int32.h"
 #include "ov-struct.h"

--- a/libinterp/dldfcn/audioread.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/audioread.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -33,7 +33,7 @@
 #include "defun-dld.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov.h"
 #include "ov-struct.h"
 

--- a/libinterp/dldfcn/chol.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/chol.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -41,7 +41,7 @@
 #include "defun-dld.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 template <class CHOLT>

--- a/libinterp/dldfcn/convhulln.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/convhulln.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -38,7 +38,7 @@
 #include "Cell.h"
 #include "defun-dld.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "parse.h"
 #include "unwind-prot.h"
 

--- a/libinterp/dldfcn/dmperm.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/dmperm.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -28,7 +28,7 @@
 #include "defun-dld.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 #include "oct-sparse.h"

--- a/libinterp/dldfcn/qr.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/qr.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -41,7 +41,7 @@
 #include "defun-dld.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 template <class MT>

--- a/libinterp/dldfcn/symbfact.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/dldfcn/symbfact.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -36,7 +36,7 @@
 #include "defun-dld.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "utils.h"
 
 DEFUN_DLD (symbfact, args, nargout,

--- a/libinterp/mkbuiltins	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/mkbuiltins	Fri Dec 18 16:04:56 2015 -0800
@@ -50,7 +50,7 @@
 #if ! defined (octave_builtin_defun_decls_h)
 #define octave_builtin_defun_decls_h 1
 
-#include "oct-obj.h"
+#include "ovl.h"
 
 #define DEFUN_DECL(name) \
   extern OCTINTERP_API octave_value_list \
@@ -79,7 +79,7 @@
 
 #include "defun.h"
 #include "help.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "variables.h"
 #include "builtins.h"
 

--- a/libinterp/octave-value/module.mk	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/module.mk	Fri Dec 18 16:04:56 2015 -0800
@@ -65,6 +65,7 @@
   libinterp/octave-value/ov-typeinfo.h \
   libinterp/octave-value/ov-usr-fcn.h \
   libinterp/octave-value/ov.h \
+  libinterp/octave-value/ovl.h \
   $(OV_INTTYPE_INC) \
   $(OV_SPARSE_INC)
 
@@ -123,6 +124,7 @@
   libinterp/octave-value/ov-typeinfo.cc \
   libinterp/octave-value/ov-usr-fcn.cc \
   libinterp/octave-value/ov.cc \
+  libinterp/octave-value/ovl.cc \
   $(OV_INTTYPE_SRC) \
   $(OV_SPARSE_SRC)
 

--- a/libinterp/octave-value/ov-base-diag.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-base-diag.h	Fri Dec 18 16:04:56 2015 -0800
@@ -31,7 +31,7 @@
 #include "mx-base.h"
 #include "str-vec.h"
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-base.h"
 #include "ov-typeinfo.h"
 

--- a/libinterp/octave-value/ov-base-int.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-base-int.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -36,7 +36,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"

--- a/libinterp/octave-value/ov-base-mat.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-base-mat.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -30,7 +30,7 @@
 #include "Array-util.h"
 
 #include "Cell.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-map.h"
 #include "ov-base.h"
 #include "ov-base-mat.h"

--- a/libinterp/octave-value/ov-base-mat.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-base-mat.h	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "MatrixType.h"
 
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-base.h"
 #include "ov-typeinfo.h"
 

--- a/libinterp/octave-value/ov-base-scalar.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-base-scalar.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -26,7 +26,7 @@
 
 #include <iostream>
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-base.h"
 #include "ov-cx-mat.h"
 #include "ov-re-mat.h"

--- a/libinterp/octave-value/ov-base-sparse.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-base-sparse.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include <iomanip>
 #include <iostream>
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-base.h"
 #include "quit.h"
 #include "pr-output.h"

--- a/libinterp/octave-value/ov-base-sparse.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-base-sparse.h	Fri Dec 18 16:04:56 2015 -0800
@@ -32,7 +32,7 @@
 #include "str-vec.h"
 
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-base.h"
 #include "ov-typeinfo.h"
 

--- a/libinterp/octave-value/ov-base.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-base.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 #include "gripes.h"
 #include "mxarray.h"
 #include "oct-map.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "oct-lvalue.h"
 #include "oct-stream.h"

--- a/libinterp/octave-value/ov-bool-mat.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-bool-mat.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 #include "defun.h"
 #include "gripes.h"
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "ops.h"
 #include "ov-base.h"

--- a/libinterp/octave-value/ov-bool.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-bool.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -31,7 +31,7 @@
 #include "gripes.h"
 #include "mxarray.h"
 #include "oct-hdf5.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ops.h"
 #include "ov-bool.h"
 #include "ov-bool-mat.h"

--- a/libinterp/octave-value/ov-builtin.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-builtin.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -26,7 +26,7 @@
 
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-builtin.h"
 #include "ov.h"
 #include "profiler.h"

--- a/libinterp/octave-value/ov-cell.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-cell.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -41,7 +41,7 @@
 #include "error.h"
 #include "mxarray.h"
 #include "ov-cell.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "unwind-prot.h"
 #include "utils.h"

--- a/libinterp/octave-value/ov-colon.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-colon.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -28,7 +28,7 @@
 
 #include "error.h"
 #include "pr-output.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-colon.h"
 
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_magic_colon,

--- a/libinterp/octave-value/ov-complex.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-complex.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -32,7 +32,7 @@
 #include "lo-mappers.h"
 
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-cs-list.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-cs-list.h	Fri Dec 18 16:04:56 2015 -0800
@@ -33,7 +33,7 @@
 
 #include "Cell.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-typeinfo.h"
 
 class tree_walker;

--- a/libinterp/octave-value/ov-cx-mat.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-cx-mat.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -38,7 +38,7 @@
 
 #include "gripes.h"
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-dld-fcn.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-dld-fcn.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include <defaults.h>
 #include "dynamic-ld.h"
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-dld-fcn.h"
 #include "ov.h"
 

--- a/libinterp/octave-value/ov-fcn.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-fcn.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -25,7 +25,7 @@
 #endif
 
 #include "error.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-fcn.h"
 
 

--- a/libinterp/octave-value/ov-fcn.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-fcn.h	Fri Dec 18 16:04:56 2015 -0800
@@ -28,7 +28,7 @@
 #include "oct-time.h"
 #include "str-vec.h"
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-base.h"
 #include "ov-typeinfo.h"
 #include "symtab.h"

--- a/libinterp/octave-value/ov-float.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-float.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "defun.h"
 #include "gripes.h"
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"
 #include "ov-scalar.h"

--- a/libinterp/octave-value/ov-flt-complex.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-flt-complex.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -31,7 +31,7 @@
 #include "lo-mappers.h"
 
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-flt-cx-mat.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-flt-cx-mat.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -38,7 +38,7 @@
 
 #include "gripes.h"
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-flt-re-mat.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-flt-re-mat.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -42,7 +42,7 @@
 #include "defun.h"
 #include "gripes.h"
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"

--- a/libinterp/octave-value/ov-int16.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-int16.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-int32.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-int32.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-int64.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-int64.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-int8.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-int8.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-java.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-java.h	Fri Dec 18 16:04:56 2015 -0800
@@ -25,7 +25,7 @@
 
 #include <jni.h>
 
-#include <oct-obj.h>
+#include <ovl.h>
 #include <ov.h>
 
 template <class T>

--- a/libinterp/octave-value/ov-mex-fcn.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-mex-fcn.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -30,7 +30,7 @@
 #include "dynamic-ld.h"
 #include "error.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-mex-fcn.h"
 #include "ov.h"
 #include "profiler.h"

--- a/libinterp/octave-value/ov-perm.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-perm.h	Fri Dec 18 16:04:56 2015 -0800
@@ -28,7 +28,7 @@
 
 #include "ov-base.h"
 #include "ov-typeinfo.h"
-#include "oct-obj.h"
+#include "ovl.h"
 
 class
 OCTINTERP_API

--- a/libinterp/octave-value/ov-range.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-range.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "gripes.h"
 #include "mxarray.h"
 #include "ops.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "ov-range.h"
 #include "ov-re-mat.h"

--- a/libinterp/octave-value/ov-re-mat.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-re-mat.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -42,7 +42,7 @@
 #include "defun.h"
 #include "gripes.h"
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"

--- a/libinterp/octave-value/ov-scalar.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-scalar.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 #include "defun.h"
 #include "gripes.h"
 #include "mxarray.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"
 #include "ov-scalar.h"

--- a/libinterp/octave-value/ov-str-mat.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-str-mat.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -43,7 +43,7 @@
 #include "ls-hdf5.h"
 #include "ls-oct-text.h"
 #include "ls-utils.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-hdf5.h"
 #include "oct-stream.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-uint16.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-uint16.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-uint32.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-uint32.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-uint64.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-uint64.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-uint8.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-uint8.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -34,7 +34,7 @@
 
 #include "defun.h"
 #include "gripes.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-lvalue.h"
 #include "oct-hdf5.h"
 #include "ops.h"

--- a/libinterp/octave-value/ov-usr-fcn.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-usr-fcn.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -35,7 +35,7 @@
 #include "error.h"
 #include "gripes.h"
 #include "input.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-usr-fcn.h"
 #include "ov.h"
 #include "pager.h"

--- a/libinterp/octave-value/ov-usr-fcn.h	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov-usr-fcn.h	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include <stack>
 
 #include "comment-list.h"
-#include "oct-obj.h"
+#include "ovl.h"
 #include "ov-fcn.h"
 #include "ov-typeinfo.h"
 #include "symtab.h"

--- a/libinterp/octave-value/ov.cc	Fri Dec 18 15:37:22 2015 -0800
+++ b/libinterp/octave-value/ov.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -29,7 +29,7 @@
 #include "quit.h"
 #include "str-vec.h"
 
-#include "oct-obj.h"
+#include "ovl.h"
 #include "oct-stream.h"
 #include "ov.h"
 #include "ov-base.h"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libinterp/octave-value/ovl.cc	Fri Dec 18 16:04:56 2015 -0800
@@ -0,0 +1,278 @@
+/*
+
+Copyright (C) 1994-2015 John W. Eaton
+Copyright (C) 2009 VZLU Prague
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "error.h"
+#include "ovl.h"
+#include "Cell.h"
+
+// We are likely to have a lot of octave_value_list objects to allocate,
+// so make the grow_size large.
+
+octave_value_list::octave_value_list (const std::list<octave_value_list>& lst)
+{
+  octave_idx_type n = 0;
+  octave_idx_type nel = 0;
+
+  // Determine number.
+  for (std::list<octave_value_list>::const_iterator p = lst.begin ();
+       p != lst.end (); p++)
+    {
+      n++;
+      nel += p->length ();
+    }
+
+  // Optimize single-element case
+  if (n == 1)
+    data = lst.front ().data;
+  else if (nel > 0)
+    {
+      data.resize (dim_vector (1, nel));
+      octave_idx_type k = 0;
+      for (std::list<octave_value_list>::const_iterator p = lst.begin ();
+           p != lst.end (); p++)
+        {
+          data.assign (idx_vector (k, k + p->length ()), p->data);
+          k += p->length ();
+        }
+      assert (k == nel);
+    }
+
+}
+
+octave_value_list&
+octave_value_list::prepend (const octave_value& val)
+{
+  octave_idx_type n = length ();
+
+  resize (n + 1);
+
+  while (n > 0)
+    {
+      elem (n) = elem (n - 1);
+      n--;
+    }
+
+  elem (0) = val;
+
+  return *this;
+}
+
+octave_value_list&
+octave_value_list::append (const octave_value& val)
+{
+  octave_idx_type n = length ();
+
+  resize (n + 1);
+
+  elem (n) = val;
+
+  return *this;
+}
+
+octave_value_list&
+octave_value_list::append (const octave_value_list& lst)
+{
+  octave_idx_type len = length ();
+  octave_idx_type lst_len = lst.length ();
+
+  resize (len + lst_len);
+
+  for (octave_idx_type i = 0; i < lst_len; i++)
+    elem (len + i) = lst (i);
+
+  return *this;
+}
+
+octave_value_list&
+octave_value_list::reverse (void)
+{
+  octave_idx_type n = length ();
+
+  for (octave_idx_type i = 0; i < n / 2; i++)
+    {
+      octave_value tmp = elem (i);
+      elem (i) = elem (n - i - 1);
+      elem (n - i - 1) = tmp;
+    }
+
+  return *this;
+}
+
+octave_value_list
+octave_value_list::splice (octave_idx_type offset, octave_idx_type rep_length,
+                           const octave_value_list& lst) const
+{
+  octave_value_list retval;
+
+  octave_idx_type len = length ();
+
+  if (offset < 0 || offset >= len)
+    {
+      if (! (rep_length == 0 && offset == len))
+        error ("octave_value_list::splice: invalid OFFSET");
+    }
+
+  if (rep_length < 0 || rep_length + offset > len)
+    error ("octave_value_list::splice: invalid LENGTH");
+
+  octave_idx_type lst_len = lst.length ();
+
+  octave_idx_type new_len = len - rep_length + lst_len;
+
+  retval.resize (new_len);
+
+  octave_idx_type k = 0;
+
+  for (octave_idx_type i = 0; i < offset; i++)
+    retval(k++) = elem (i);
+
+  for (octave_idx_type i = 0; i < lst_len; i++)
+    retval(k++) = lst (i);
+
+  for (octave_idx_type i = offset + rep_length; i < len; i++)
+    retval(k++) = elem (i);
+
+  return retval;
+}
+
+bool
+octave_value_list::all_strings_p (void) const
+{
+  octave_idx_type n = length ();
+
+  for (octave_idx_type i = 0; i < n; i++)
+    if (! elem(i).is_string ())
+      return false;
+
+  return true;
+}
+
+bool
+octave_value_list::all_scalars (void) const
+{
+  octave_idx_type n = length ();
+
+  for (octave_idx_type i = 0; i < n; i++)
+    {
+      dim_vector dv = elem(i).dims ();
+      if (! dv.all_ones ())
+        return false;
+    }
+
+  return true;
+}
+
+bool
+octave_value_list::any_cell (void) const
+{
+  octave_idx_type n = length ();
+
+  for (octave_idx_type i = 0; i < n; i++)
+    if (elem (i).is_cell ())
+      return true;
+
+  return false;
+}
+
+bool
+octave_value_list::has_magic_colon (void) const
+{
+  octave_idx_type n = length ();
+
+  for (octave_idx_type i = 0; i < n; i++)
+    if (elem(i).is_magic_colon ())
+      return true;
+
+  return false;
+}
+
+string_vector
+octave_value_list::make_argv (const std::string& fcn_name) const
+{
+  string_vector argv;
+
+  if (all_strings_p ())
+    {
+      octave_idx_type len = length ();
+
+      octave_idx_type total_nr = 0;
+
+      for (octave_idx_type i = 0; i < len; i++)
+        {
+          // An empty std::string ("") has zero columns and zero rows (a
+          // change that was made for Matlab contemptibility.
+
+          octave_idx_type n = elem(i).rows ();
+
+          total_nr += n ? n : 1;
+        }
+
+      octave_idx_type k = 0;
+      if (! fcn_name.empty ())
+        {
+          argv.resize (total_nr+1);
+          argv[0] = fcn_name;
+          k = 1;
+        }
+      else
+        argv.resize (total_nr);
+
+      for (octave_idx_type i = 0; i < len; i++)
+        {
+          octave_idx_type nr = elem(i).rows ();
+
+          if (nr < 2)
+            argv[k++] = elem(i).string_value ();
+          else
+            {
+              string_vector tmp = elem(i).all_strings ();
+
+              for (octave_idx_type j = 0; j < nr; j++)
+                argv[k++] = tmp[j];
+            }
+        }
+    }
+  else
+    error ("%s: all arguments must be strings", fcn_name.c_str ());
+
+  return argv;
+}
+
+void
+octave_value_list::make_storable_values (void)
+{
+  octave_idx_type len = length ();
+  const Array<octave_value>& cdata = data;
+
+  for (octave_idx_type i = 0; i < len; i++)
+    {
+      // This is optimized so that we don't force a copy unless necessary.
+      octave_value tmp = cdata(i).storable_value ();
+      if (! tmp.is_copy_of (cdata (i)))
+        data(i) = tmp;
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libinterp/octave-value/ovl.h	Fri Dec 18 16:04:56 2015 -0800
@@ -0,0 +1,322 @@
+/*
+
+Copyright (C) 1994-2015 John W. Eaton
+Copyright (C) 2009 VZLU Prague
+
+This file is part of Octave.
+
+Octave is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3 of the License, or (at your
+option) any later version.
+
+Octave is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Octave; see the file COPYING.  If not, see
+<http://www.gnu.org/licenses/>.
+
+*/
+
+#if ! defined (octave_ovl_h)
+#define octave_ovl_h 1
+
+#include <string>
+#include <vector>
+
+#include "str-vec.h"
+#include "Array.h"
+
+#include "ov.h"
+#include "Cell.h"
+
+class
+OCTINTERP_API
+octave_value_list
+{
+public:
+
+  octave_value_list (void)
+    : data (), names () { }
+
+  explicit octave_value_list (octave_idx_type n)
+    : data (dim_vector (1, n)), names () { }
+
+  octave_value_list (octave_idx_type n, const octave_value& val)
+    : data (dim_vector (1, n), val), names () { }
+
+  octave_value_list (const octave_value& tc)
+    : data (dim_vector (1, 1), tc), names () { }
+
+  octave_value_list (const Array<octave_value>& d)
+    : data (d.as_row ()), names () { }
+
+  octave_value_list (const Cell& tc)
+    : data (tc.as_row ()), names () { }
+
+  octave_value_list (const octave_value_list& obj)
+    : data (obj.data), names (obj.names) { }
+
+  // Concatenation constructor.
+  octave_value_list (const std::list<octave_value_list>&);
+
+  ~octave_value_list (void) { }
+
+  octave_value_list& operator = (const octave_value_list& obj)
+  {
+    if (this != &obj)
+      {
+        data = obj.data;
+        names = obj.names;
+      }
+
+    return *this;
+  }
+
+  Array<octave_value> array_value (void) const { return data; }
+
+  Cell cell_value (void) const { return array_value (); }
+
+  // Assignment will resize on range errors.
+
+  octave_value& operator () (octave_idx_type n) { return elem (n); }
+
+  const octave_value& operator () (octave_idx_type n) const { return elem (n); }
+
+  octave_idx_type length (void) const { return data.numel (); }
+
+  bool empty (void) const { return length () == 0; }
+
+  void resize (octave_idx_type n, const octave_value& rfv = octave_value ())
+  {
+    data.resize (dim_vector (1, n), rfv);
+  }
+
+  octave_value_list& prepend (const octave_value& val);
+
+  octave_value_list& append (const octave_value& val);
+
+  octave_value_list& append (const octave_value_list& lst);
+
+  octave_value_list& reverse (void);
+
+  octave_value_list
+  slice (octave_idx_type offset, octave_idx_type len, bool tags = false) const
+  {
+    // linear_slice uses begin/end indices instead of offset and length.
+    // Avoid calling with upper bound out of range.
+    // linear_slice handles the case of len < 0.
+
+    octave_value_list retval
+      = data.linear_slice (offset, std::min (offset + len, length ()));
+
+    if (tags && len > 0 && names.numel () > 0)
+      retval.names = names.linear_slice (offset, std::min (offset + len,
+                                                           names.numel ()));
+
+    return retval;
+  }
+
+  octave_value_list
+  splice (octave_idx_type offset, octave_idx_type len,
+          const octave_value_list& lst = octave_value_list ()) const;
+
+  bool all_strings_p (void) const;
+
+  bool all_scalars (void) const;
+
+  bool any_cell (void) const;
+
+  bool has_magic_colon (void) const;
+
+  string_vector make_argv (const std::string& = std::string ()) const;
+
+  void stash_name_tags (const string_vector& nm) { names = nm; }
+
+  string_vector name_tags (void) const { return names; }
+
+  void make_storable_values (void);
+
+  octave_value& xelem (octave_idx_type i) { return data.xelem (i); }
+
+  void clear (void) { data.clear (); }
+
+private:
+
+  Array<octave_value> data;
+
+  // This list of strings can be used to tag each element of data with a name.
+  // By default, it is empty.
+  string_vector names;
+
+  octave_value& elem (octave_idx_type n)
+  {
+    if (n >= length ())
+      resize (n + 1);
+
+    return data(n);
+  }
+
+  const octave_value& elem (octave_idx_type n) const
+  { return data(n); }
+
+};
+
+// Make it easy to build argument lists for built-in functions,
+// or for returning values.
+
+inline octave_value_list
+ovl ()
+{
+  return octave_value_list ();
+}
+
+inline octave_value_list
+ovl (const octave_value& a0)
+{
+  octave_value_list retval (1);
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1)
+{
+  octave_value_list retval (2);
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1,
+     const octave_value& a2)
+{
+  octave_value_list retval (3);
+  retval(2) = a2;
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1,
+     const octave_value& a2, const octave_value& a3)
+{
+  octave_value_list retval (4);
+  retval(3) = a3;
+  retval(2) = a2;
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1,
+     const octave_value& a2, const octave_value& a3,
+     const octave_value& a4)
+{
+  octave_value_list retval (5);
+  retval(4) = a4;
+  retval(3) = a3;
+  retval(2) = a2;
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1,
+     const octave_value& a2, const octave_value& a3,
+     const octave_value& a4, const octave_value& a5)
+{
+  octave_value_list retval (6);
+  retval(5) = a5;
+  retval(4) = a4;
+  retval(3) = a3;
+  retval(2) = a2;
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1,
+     const octave_value& a2, const octave_value& a3,
+     const octave_value& a4, const octave_value& a5,
+     const octave_value& a6)
+{
+  octave_value_list retval (7);
+  retval(6) = a6;
+  retval(5) = a5;
+  retval(4) = a4;
+  retval(3) = a3;
+  retval(2) = a2;
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1,
+     const octave_value& a2, const octave_value& a3,
+     const octave_value& a4, const octave_value& a5,
+     const octave_value& a6, const octave_value& a7)
+{
+  octave_value_list retval (8);
+  retval(7) = a7;
+  retval(6) = a6;
+  retval(5) = a5;
+  retval(4) = a4;
+  retval(3) = a3;
+  retval(2) = a2;
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1,
+     const octave_value& a2, const octave_value& a3,
+     const octave_value& a4, const octave_value& a5,
+     const octave_value& a6, const octave_value& a7,
+     const octave_value& a8)
+{
+  octave_value_list retval (9);
+  retval(8) = a8;
+  retval(7) = a7;
+  retval(6) = a6;
+  retval(5) = a5;
+  retval(4) = a4;
+  retval(3) = a3;
+  retval(2) = a2;
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+inline octave_value_list
+ovl (const octave_value& a0, const octave_value& a1,
+     const octave_value& a2, const octave_value& a3,
+     const octave_value& a4, const octave_value& a5,
+     const octave_value& a6, const octave_value& a7,
+     const octave_value& a8, const octave_value& a9)
+{
+  octave_value_list retval (10);
+  retval(9) = a9;
+  retval(8) = a8;
+  retval(7) = a7;
+  retval(6) = a6;
+  retval(5) = a5;
+  retval(4) = a4;
+  retval(3) = a3;
+  retval(2) = a2;
+  retval(1) = a1;
+  retval(0) = a0;
+  return retval;
+}
+
+#endif