Changeset 90f715 in git for kernel

Timestamp:

Dec 13, 2016, 10:01:44 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

1ae67730fa57673e19cd4e827e43af59b10709c1

Parents:

395bff88a6362715713dacd455c278cd6e494d75

Message:

change: use rRingOrder_t instead of int

Location:

kernel

Files:

• GBEngine/kutil.cc (modified) (4 diffs)
• ideals.cc (modified) (5 diffs)

kernel/GBEngine/kutil.cc

@@ -11395 +11395 @@
     }
     ring res = rCopy0(r, TRUE, FALSE);
-    res->order  = (int *)omAlloc0((n+1)*sizeof(int));
+    res->order  = (rRingOrder_t *)omAlloc0((n+1)*sizeof(rRingOrder_t));
     res->block0 = (int *)omAlloc0((n+1)*sizeof(int));
     res->block1 = (int *)omAlloc0((n+1)*sizeof(int));
@@ -11415 +11415 @@
       if (res->order[i] == ringorder_C || res->order[i] == ringorder_c)
       {
-        res->order[i] = 0;
+        res->order[i] = (rRingOrder_t)0;
       }
     }
@@ -11443 +11443 @@
   {
     ring res = rCopy0(r, TRUE, FALSE);
-    res->order  = (int *)omAlloc0((n+2)*sizeof(int));
+    res->order  = (rRingOrder_t*)omAlloc0((n+2)*sizeof(rRingOrder_t));
     res->block0 = (int *)omAlloc0((n+2)*sizeof(int));
     res->block1 = (int *)omAlloc0((n+2)*sizeof(int));
@@ -11471 +11471 @@
       if (res->order[i] == ringorder_C || res->order[i] == ringorder_c)
       {
-        res->order[i] = 0;
+        res->order[i] = (rRingOrder_t)0;
       }
     }

kernel/ideals.cc

@@ -146 +146 @@
   r->block1[0]= r->N;
   omFree(r->order);
-  r->order=(int*)omAlloc0(3*sizeof(int*));
+  r->order=(rRingOrder_t*)omAlloc0(3*sizeof(rRingOrder_t));
   r->order[0]=ringorder_dp;
   r->order[1]=ringorder_C;
@@ -1355 +1355 @@
   int    i,j=0,k,l;
   ideal  h,hh, h3;
-  int    *ord,*block0,*block1;
+  rRingOrder_t    *ord;
+  int    *block0,*block1;
   int    ordersize=2;
   int    **wv;
@@ -1435 +1436 @@
     // this seems to be better than version 2 below,
     // according to Tst/../elimiate_[3568].tat (- 17 %)
-    ord=(int*)omAlloc0(4*sizeof(int));
+    ord=(rRingOrder_t*)omAlloc0(4*sizeof(rRingOrder_t));
     block0=(int*)omAlloc0(4*sizeof(int));
     block1=(int*)omAlloc0(4*sizeof(int));
@@ -1478 +1479 @@
     #endif
     ord[2] = ringorder_C;
-    ord[3] = 0;
+    ord[3] = (rRingOrder_t)0;
   }
   else
@@ -1484 +1485 @@
     // we change to an ordering:
     // aa(....),orig_ordering
-    ord=(int*)omAlloc0(ordersize*sizeof(int));
+    ord=(rRingOrder_t*)omAlloc0(ordersize*sizeof(rRingOrder_t));
     block0=(int*)omAlloc0(ordersize*sizeof(int));
     block1=(int*)omAlloc0(ordersize*sizeof(int));