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

[watsma]

The following commit has been merged in the master branch:
commit 22b2ad46c75a8e29f158e41ada50088185422390
Author: watsma <watsma at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Sat May 24 16:49:44 2003 +0000

    Added conditional include for octave version 2.1.48.
    
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@961 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/findsymbols.cc b/findsymbols.cc
index 9dc4209..59a4ed0 100644
--- a/findsymbols.cc
+++ b/findsymbols.cc
@@ -18,6 +18,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 #include <octave/oct.h>
 
+#ifdef NEED_OCTAVE_QUIT
+#define OCTAVE_QUIT do {} while (0)
+#else
+#include <octave/quit.h>
+#endif
+
 #include <ginac/ginac.h>
 #include "ov-vpa.h"
 #include "ov-ex.h"
@@ -38,6 +44,7 @@ static void append_symbols(octave_value_list& symlist,const GiNaC::ex& expressio
 			GiNaC::symbol sym, sym_new = GiNaC::ex_to<GiNaC::symbol>(expression.op(i));
 			std::string sym_name,sym_name_new = sym_new.get_name();
 			for(j=0;j<symlist.length();j++) {
+				OCTAVE_QUIT;
 				/* have to convert back to compare: */
 				get_symbol(symlist(j),ex_sym);
 				sym = GiNaC::ex_to<GiNaC::symbol>(ex_sym);
diff --git a/symbols.cc b/symbols.cc
index 66f2fd0..96a7203 100644
--- a/symbols.cc
+++ b/symbols.cc
@@ -30,6 +30,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <octave/gripes.h>
 #include <octave/oct-obj.h>
 #include <octave/pager.h>
+
+#ifdef NEED_OCTAVE_QUIT
+#define OCTAVE_QUIT do {} while (0)
+#else
+#include <octave/quit.h>
+#endif
+
 #include <ginac/ginac.h>
 #include "ov-vpa.h"
 #include "ov-ex.h"
@@ -324,6 +331,7 @@ w = subs (f,@{x,y@},@{1,vpa(1/3)@})\n\
 			}
 			tmp = expression;
 			for(i=0;i<symlist.length();i++) {
+				OCTAVE_QUIT;
 				if (!get_symbol (symlist(i),the_sym)) {
 					gripe_wrong_type_arg("subs",symlist(i));
 					return retval;

-- 
octave-symbolic