Mercurial > forge

changeset 942:c1cd4e96b0ce octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added conditional include for octave version 2.1.48.
author watsma
date Sat, 24 May 2003 16:49:44 +0000
parents f6870e5d2382
children eac1406de611
files main/symbolic/findsymbols.cc main/symbolic/symbols.cc
diffstat 2 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/main/symbolic/findsymbols.cc	Thu May 22 15:19:48 2003 +0000
+++ b/main/symbolic/findsymbols.cc	Sat May 24 16:49:44 2003 +0000
@@ -18,6 +18,12 @@
 */
 #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 @@
 			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);
--- a/main/symbolic/symbols.cc	Thu May 22 15:19:48 2003 +0000
+++ b/main/symbolic/symbols.cc	Sat May 24 16:49:44 2003 +0000
@@ -30,6 +30,13 @@
 #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 @@
 			}
 			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;