[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b
adb014
adb014 at 416fae20-06d0-4450-9b69-c6c34d4b5f03
Mon Jan 3 03:40:42 UTC 2011
The following commit has been merged in the master branch:
commit 6af63245b96612ae3d8d549e2808a5c6bede67f5
Author: adb014 <adb014 at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date: Thu Apr 13 21:21:12 2006 +0000
Commit changes from JWE for octave_value/octave_base_value changes in 2.9.5+
git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@2406 416fae20-06d0-4450-9b69-c6c34d4b5f03
diff --git a/ov-ex-mat.h b/ov-ex-mat.h
index 152afa2..d7a9d98 100644
--- a/ov-ex-mat.h
+++ b/ov-ex-mat.h
@@ -23,6 +23,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <ginac/ginac.h>
+#ifndef OV_REP_TYPE
+#define OV_REP_TYPE octave_value
+#endif
+
class octave_matrix;
class octave_complex_matrix;
@@ -55,7 +59,7 @@ public:
return GiNaC::ex(x);
}
- octave_value *clone (void)
+ OV_REP_TYPE *clone (void)
{
return new octave_ex_matrix (*this);
}
diff --git a/ov-ex.h b/ov-ex.h
index f56c530..1a98bf3 100644
--- a/ov-ex.h
+++ b/ov-ex.h
@@ -27,6 +27,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <octave/ov-scalar.h>
#include "ov-vpa.h"
+#ifndef OV_REP_TYPE
+#define OV_REP_TYPE octave_value
+#endif
class octave_complex;
class octave_scalar;
@@ -54,7 +57,7 @@ public:
return x;
}
- octave_value *clone (void)
+ OV_REP_TYPE *clone (void)
{
return new octave_ex (*this);
}
diff --git a/ov-relational.h b/ov-relational.h
index 13c67c8..4a8d806 100644
--- a/ov-relational.h
+++ b/ov-relational.h
@@ -26,6 +26,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <octave/ov-base.h>
#include "ov-ex.h"
+#ifndef OV_REP_TYPE
+#define OV_REP_TYPE octave_value
+#endif
+
// relational values.
class
@@ -55,7 +59,7 @@ public:
~octave_relational (void) { }
- octave_value *clone (void) { return new octave_relational (*this); }
+ OV_REP_TYPE *clone (void) { return new octave_relational (*this); }
#ifdef HAVE_ND_ARRAYS
dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; }
diff --git a/ov-vpa.h b/ov-vpa.h
index 3bd8e82..d77929e 100644
--- a/ov-vpa.h
+++ b/ov-vpa.h
@@ -25,6 +25,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <ginac/ginac.h>
#include <octave/ov-base.h>
+#ifndef OV_REP_TYPE
+#define OV_REP_TYPE octave_value
+#endif
+
// vpa values.
class
@@ -40,7 +44,7 @@ public:
~octave_vpa (void) { }
- octave_value *clone (void) { return new octave_vpa (*this); }
+ OV_REP_TYPE *clone (void) { return new octave_vpa (*this); }
#if 0
void *operator new (size_t size);
--
octave-symbolic
More information about the Pkg-octave-commit
mailing list