The patch of 2005-05-01 made it impossible to test the type of a cl_UP

by comparing with &cl_class_univpoly_ring. We need an alternative:
* include/cln/object.h (cl_class_flags_modint_ring): New #define...
* src/polynomial/elem/cl_UP.cc (cl_class_univpoly_ring): ...used here.
* src/polynomial/elem/cl_UP_GF2.h: Likewise.
* src/polynomial/elem/cl_UP_MI.h: Likewise.
* src/polynomial/elem/cl_UP_gen.h: Likewise.
* src/polynomial/elem/cl_UP_number.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 1d33bd04b0418a8b0f9c706442d3416eff7cc433..cc1e2de3282dbfe912d6b9fbfe0295172c32bdbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-08-16  Richard B. Kreckel  <kreckel@ginac.de>
+
+       The patch of 2005-05-01 made it impossible to test the type of a cl_UP
+       by comparing with &cl_class_univpoly_ring. We need an alternative:
+       * include/cln/object.h (cl_class_flags_modint_ring): New #define...
+       * src/polynomial/elem/cl_UP.cc (cl_class_univpoly_ring): ...used here.
+       * src/polynomial/elem/cl_UP_GF2.h: Likewise.
+       * src/polynomial/elem/cl_UP_MI.h: Likewise.
+       * src/polynomial/elem/cl_UP_gen.h: Likewise.
+       * src/polynomial/elem/cl_UP_number.h: Likewise.
+
 2005-08-15  Richard B. Kreckel  <kreckel@ginac.de>
 
        * m4/cc.m4 (CL_AS_NOEXECSTACK): New macro...

diff --git a/include/cln/object.h b/include/cln/object.h
index 4a254433ce753189ece68fa2579dc0fa1aa5a177..c5ebc99defff9cf2782dcb1b41fafee289a4ea0e 100644 (file)
--- a/include/cln/object.h
+++ b/include/cln/object.h
@@ -177,6 +177,8 @@ typedef void (*cl_heap_destructor_function) (cl_heap* pointer);
                                              // elements belong to cl_number
 #define cl_class_flags_modint_ring       32  // all instances are rings whose
                                              // elements belong to cl_MI
+#define cl_class_flags_univpoly_ring     64  // all instances are rings whose
+                                             // elements belong to cl_UP
 // Function to print an object for debugging, to cerr.
 typedef void (*cl_heap_dprint_function) (cl_heap* pointer);
 

diff --git a/src/polynomial/elem/cl_UP.cc b/src/polynomial/elem/cl_UP.cc
index 8da020077cc38e77e9025ab8070bdf632a3d090f..967e3856f2ee03bc32a19df4e9095459d8f6acd2 100644 (file)
--- a/src/polynomial/elem/cl_UP.cc
+++ b/src/polynomial/elem/cl_UP.cc
@@ -45,7 +45,7 @@ static void cl_univpoly_ring_destructor (cl_heap* pointer)
 
 cl_class cl_class_univpoly_ring = {
        cl_univpoly_ring_destructor,
-       0
+       cl_class_flags_univpoly_ring
 };
 
 cl_heap_univpoly_ring::cl_heap_univpoly_ring (const cl_ring& r, cl_univpoly_setops* setopv, cl_univpoly_addops* addopv, cl_univpoly_mulops* mulopv, cl_univpoly_modulops* modulopv, cl_univpoly_polyops* polyopv)

diff --git a/src/polynomial/elem/cl_UP_GF2.h b/src/polynomial/elem/cl_UP_GF2.h
index a7d1551305cf67fa95dee2164068ee8ee500b081..2011b34aacea68c7fb3aaafb9be936c9f089d182 100644 (file)
--- a/src/polynomial/elem/cl_UP_GF2.h
+++ b/src/polynomial/elem/cl_UP_GF2.h
@@ -1053,7 +1053,7 @@ static void cl_heap_gf2_univpoly_ring_destructor (cl_heap* pointer)
 
 cl_class cl_class_gf2_univpoly_ring = {
        cl_heap_gf2_univpoly_ring_destructor,
-       0
+       cl_class_flags_univpoly_ring
 };
 
 // Constructor.

diff --git a/src/polynomial/elem/cl_UP_MI.h b/src/polynomial/elem/cl_UP_MI.h
index 664dc43927fe1bb59b369bbb15f4bc8d1363e782..62b2ea6d638b0822e3ecf690524f4f9d3ad4d5a8 100644 (file)
--- a/src/polynomial/elem/cl_UP_MI.h
+++ b/src/polynomial/elem/cl_UP_MI.h
@@ -493,7 +493,7 @@ static void cl_heap_modint_univpoly_ring_destructor (cl_heap* pointer)
 
 cl_class cl_class_modint_univpoly_ring = {
        cl_heap_modint_univpoly_ring_destructor,
-       0
+       cl_class_flags_univpoly_ring
 };
 
 // Constructor.

diff --git a/src/polynomial/elem/cl_UP_gen.h b/src/polynomial/elem/cl_UP_gen.h
index ad9093b2144c0fe568974875e0c7bcff149a458f..9c11643d517f154c5815747c889d5d625f891aec 100644 (file)
--- a/src/polynomial/elem/cl_UP_gen.h
+++ b/src/polynomial/elem/cl_UP_gen.h
@@ -472,7 +472,7 @@ static void cl_heap_gen_univpoly_ring_destructor (cl_heap* pointer)
 
 cl_class cl_class_gen_univpoly_ring = {
        cl_heap_gen_univpoly_ring_destructor,
-       0
+       cl_class_flags_univpoly_ring
 };
 
 // Constructor.

diff --git a/src/polynomial/elem/cl_UP_number.h b/src/polynomial/elem/cl_UP_number.h
index ea879b8ac358dd4d46fe73b965985aa42a1be672..4b8e906caeb36d7e39edd998c85c1930b13fc51d 100644 (file)
--- a/src/polynomial/elem/cl_UP_number.h
+++ b/src/polynomial/elem/cl_UP_number.h
@@ -475,7 +475,7 @@ static void cl_heap_num_univpoly_ring_destructor (cl_heap* pointer)
 
 cl_class cl_class_num_univpoly_ring = {
        cl_heap_num_univpoly_ring_destructor,
-       0
+       cl_class_flags_univpoly_ring
 };
 
 // Constructor.