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

[adb014]

The following commit has been merged in the master branch:
commit f52ed3c0dd5dd5136f3c877071aa1ad7ed484ce0
Author: adb014 <adb014 at 416fae20-06d0-4450-9b69-c6c34d4b5f03>
Date:   Wed Nov 10 15:26:36 2004 +0000

    Must explicitly use the "GiNaC::operator ==" as there is an ambiguity
    between this and the newly introduced int-type operators in the octave
    core..
    
    
    git-svn-id: https://octave.svn.sourceforge.net/svnroot/octave/trunk/octave-forge/main/symbolic@1820 416fae20-06d0-4450-9b69-c6c34d4b5f03

diff --git a/findsymbols.cc b/findsymbols.cc
index 59a4ed0..90df2e0 100644
--- a/findsymbols.cc
+++ b/findsymbols.cc
@@ -48,7 +48,7 @@ static void append_symbols(octave_value_list& symlist,const GiNaC::ex& expressio
 				/* have to convert back to compare: */
 				get_symbol(symlist(j),ex_sym);
 				sym = GiNaC::ex_to<GiNaC::symbol>(ex_sym);
-				if(sym==sym_new) {
+				if(GiNaC::operator == (sym,sym_new)) {
 					unique = false;
 					break;
 				} else {
diff --git a/ov-ex.cc b/ov-ex.cc
index 291cdb3..41891f2 100644
--- a/ov-ex.cc
+++ b/ov-ex.cc
@@ -115,7 +115,7 @@ octave_ex::~octave_ex()
 		GiNaC::symbol sym = GiNaC::ex_to<GiNaC::symbol>(x);
 		std::vector<symbol_list_item>::iterator iter_symlist;
 		for(iter_symlist=symbol_list.begin();iter_symlist<symbol_list.end();iter_symlist++) {
-			if(sym == iter_symlist->sym) {
+		  if(GiNaC::operator == (sym, iter_symlist->sym)) {
 				iter_symlist->refcount --;
 				if(iter_symlist->refcount==0)
 					symbol_list.erase(iter_symlist);

-- 
octave-symbolic