X-Git-Url: https://ginac.de/CLN/cln.git//cln.git?a=blobdiff_plain;f=src%2Fpolynomial%2Felem%2Fcl_UP_named.cc;h=dd797347e9067d8429f63545f3c6f01a3c25e354;hb=8b3d91dec77438c0fe679b10869ab29e6cdeba58;hp=38a299447cab88159fd65d1cce70dcb57c71ddbe;hpb=850abfde7f0d985ba01526c346bcd0d733562943;p=cln.git

diff --git a/src/polynomial/elem/cl_UP_named.cc b/src/polynomial/elem/cl_UP_named.cc
index 38a2994..dd79734 100644
--- a/src/polynomial/elem/cl_UP_named.cc
+++ b/src/polynomial/elem/cl_UP_named.cc
@@ -39,13 +39,13 @@ namespace cln {
 // the ring contains exactly one reference to the base ring and exactly one
 // reference to the name (on the property list).
 
-static cl_boolean maygc_htentry (const cl_htentry_from_rcpointer2_to_rcpointer& entry)
+static bool maygc_htentry (const cl_htentry_from_rcpointer2_to_rcpointer& entry)
 {
 	if (!entry.key1.pointer_p() || (entry.key1.heappointer->refcount == 2))
 		if (!entry.key2.pointer_p() || (entry.key2.heappointer->refcount == 2))
 			if (!entry.val.pointer_p() || (entry.val.heappointer->refcount == 1))
-				return cl_true;
-	return cl_false;
+				return true;
+	return false;
 }
 
 static const cl_wht_from_rcpointer2_to_rcpointer univpoly_ring_table = cl_wht_from_rcpointer2_to_rcpointer(maygc_htentry);
@@ -70,7 +70,7 @@ const cl_univpoly_ring find_univpoly_ring (const cl_ring& r, const cl_symbol& va
 		store_univpoly_ring(R);
 		ring_in_table = get_univpoly_ring(r,varname);
 		if (!ring_in_table)
-			cl_abort();
+			throw runtime_exception();
 	}
 	return *ring_in_table;
 }