X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fbasic.cpp;h=38219dcd029274b1d82ad733bccb13f4ffa339ba;hp=b4e38614aaa2942306d085f68c45046f162813c3;hb=5a8b8e3c4d882249db35b679ce3144a59a7012e8;hpb=568524ae4543f305035f4c5b2ecdb4cf78514c33

diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index b4e38614..38219dcd 100644
--- a/ginac/basic.cpp
+++ b/ginac/basic.cpp
@@ -286,13 +286,13 @@ ex & basic::operator[](size_t i)
  *  the pattern itself or one of the children 'has' it.  As a consequence
  *  (according to the definition of children) given e=x+y+z, e.has(x) is true
  *  but e.has(x+y) is false. */
-bool basic::has(const ex & pattern) const
+bool basic::has(const ex & pattern, unsigned options) const
 {
 	lst repl_lst;
 	if (match(pattern, repl_lst))
 		return true;
 	for (size_t i=0; i<nops(); i++)
-		if (op(i).has(pattern))
+		if (op(i).has(pattern, options))
 			return true;
 	
 	return false;
@@ -788,7 +788,7 @@ const basic* basic::return_type_tinfo() const
  *  would all end up with the same hashvalue. */
 unsigned basic::calchash() const
 {
-	unsigned v = golden_ratio_hash((unsigned)tinfo());
+	unsigned v = golden_ratio_hash((p_int)tinfo());
 	for (size_t i=0; i<nops(); i++) {
 		v = rotate_left(v);
 		v ^= this->op(i).gethash();