[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. a718b53403d9f164f8c2a3df521385a01d28a11b

[adb014]

The following commit has been merged in the master branch:
commit b8939bf1163ff657cd773ffd2996415719afa0b9
Author: adb014 <adb014 at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Mon Nov 17 17:04:41 2003 +0000

    Updates for 2.1.51
    
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@1138 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/Makefile b/Makefile
index 1dd5b08..e6efc12 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ SRC=symbols.cc probably_prime.cc differentiate.cc \
 	op-ex-mat.cc op-ex.cc op-vpa.cc 
 OBJ=$(SRC:.cc=.o)
 
-%.o: %.cc ; $(MKOCTFILE) -v $(GINAC_CPP_FLAGS) -c $<
+%.o: %.cc ; $(MKOCTFILE) -v $(GINAC_CPP_FLAGS) $(HAVE_ND_ARRAYS) -c $<
 
 FUNCTIONS=vpa sym is_vpa is_sym is_ex to_double digits\
           Cos Sin Tan aCos aSin aTan Cosh Sinh Tanh aCosh\
diff --git a/ov-ex-mat.h b/ov-ex-mat.h
index aea199d..152afa2 100644
--- a/ov-ex-mat.h
+++ b/ov-ex-mat.h
@@ -60,6 +60,9 @@ public:
       return new octave_ex_matrix (*this); 
     }
   
+#ifdef HAVE_ND_ARRAYS
+  dim_vector dims (void) const {dim_vector dv (x.rows(), x.cols()); return dv; }
+#endif
   int rows (void) const { return x.rows (); }
   int columns (void) const { return x.cols (); }
   
diff --git a/ov-ex.h b/ov-ex.h
index d1a22ae..f56c530 100644
--- a/ov-ex.h
+++ b/ov-ex.h
@@ -59,6 +59,9 @@ public:
       return new octave_ex (*this); 
     }
   
+#ifdef HAVE_ND_ARRAYS
+  dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; }
+#endif
   int rows (void) const { return 1; }
   int columns (void) const { return 1; }
   
diff --git a/ov-relational.h b/ov-relational.h
index 1f32c95..13c67c8 100644
--- a/ov-relational.h
+++ b/ov-relational.h
@@ -57,6 +57,9 @@ public:
 
   octave_value *clone (void) { return new octave_relational (*this); }
 
+#ifdef HAVE_ND_ARRAYS
+  dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; }
+#endif
   int rows (void) const { return 1; }
   int columns (void) const { return 1; }
 
diff --git a/ov-vpa.h b/ov-vpa.h
index 18fb28b..3bd8e82 100644
--- a/ov-vpa.h
+++ b/ov-vpa.h
@@ -47,6 +47,9 @@ public:
   void operator delete (void *p, size_t size);
 #endif 
 
+#ifdef HAVE_ND_ARRAYS
+  dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; }
+#endif
   int rows (void) const { return 1; }
   int columns (void) const { return 1; }
 

-- 
octave-symbolic