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

[pkienzle]

The following commit has been merged in the master branch:
commit 093825619f8d01c49ad84f07412c84ba625682af
Author: pkienzle <pkienzle at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Tue Nov 18 04:45:47 2003 +0000

    Octave now defines type class as well as type name.
    
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@1140 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/Makefile b/Makefile
index e6efc12..0446878 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) $(HAVE_ND_ARRAYS) -c $<
+%.o: %.cc ; $(MKOCTFILE) -v $(GINAC_CPP_FLAGS) $(HAVE_ND_ARRAYS) $(TYPEID_HAS_CLASS) -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.cc b/ov-ex-mat.cc
index 30ad7b3..43ba619 100644
--- a/ov-ex-mat.cc
+++ b/ov-ex-mat.cc
@@ -103,4 +103,8 @@ octave_ex_matrix& octave_ex_matrix::operator=(const octave_ex_matrix& a)
 
 DEFINE_OCTAVE_ALLOCATOR (octave_ex_matrix);
 
+#ifdef TYPEID_HAS_CLASS
+DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_ex_matrix, "symbolic matrix","sym");
+#else
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_ex_matrix, "symbolic matrix");
+#endif
diff --git a/ov-ex.cc b/ov-ex.cc
index ba5dd6f..291cdb3 100644
--- a/ov-ex.cc
+++ b/ov-ex.cc
@@ -138,7 +138,11 @@ octave_ex& octave_ex::operator=(const octave_ex& a)
 
 DEFINE_OCTAVE_ALLOCATOR (octave_ex);
 
+#ifdef TYPEID_HAS_CLASS
+DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_ex, "ex", "sym");
+#else
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_ex, "ex");
+#endif
 
 /*
 ;;; Local Variables: ***
diff --git a/ov-relational.cc b/ov-relational.cc
index df7c994..6db92c1 100644
--- a/ov-relational.cc
+++ b/ov-relational.cc
@@ -60,7 +60,11 @@ octave_relational::print (std::ostream& os, bool pr_as_read_syntax) const
 
 DEFINE_OCTAVE_ALLOCATOR (octave_relational);
 
+#ifdef TYPEID_HAS_CLASS
+DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_relational, "relational", "sym");
+#else
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_relational, "relational");
+#endif
 
 /*
 ;;; Local Variables: ***
diff --git a/ov-vpa.cc b/ov-vpa.cc
index 081e236..d831c1b 100644
--- a/ov-vpa.cc
+++ b/ov-vpa.cc
@@ -56,7 +56,11 @@ octave_vpa::print (std::ostream& os, bool pr_as_read_syntax) const
 
 DEFINE_OCTAVE_ALLOCATOR (octave_vpa);
 
+#ifdef TYPEID_HAS_CLASS
+DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_vpa, "vpa", "sym");
+#else
 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_vpa, "vpa");
+#endif
 
 /*
 ;;; Local Variables: ***

-- 
octave-symbolic