Changeset a7a94ed in git

Timestamp:

Jan 6, 2010, 1:27:29 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

b46774f2ffde4294abff59d9fdb51d1914924c72

Parents:

8cc23471085d8b316b9e069e3af261cb141cccea

Message:

HAVE_IDI is now standard

git-svn-id: file:///usr/local/Singular/svn/trunk@12407 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• hilb.cc (modified) (4 diffs)
• structs.h (modified) (2 diffs)

kernel/hilb.cc

@@ -217 +217 @@
   intvec *work, *hseries1=NULL;
   int  mc;
-  int  *p0;
+  int  p0;
   int  i, j, k, l, ii, mw;
   hexist = hInit(S, Q, &hNexist, tailRing);
@@ -237 +237 @@
   #endif
 
-  p0 = (int *)omAllocBin(int_bin);
-  *p0 = 1;
+  p0 = 1;
   hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
   hvar = (varset)omAlloc((pVariables + 1) * sizeof(int));
@@ -285 +284 @@
         hLexS(hstc, hNstc, hvar, hNvar);
         Q0[hNvar] = 0;
-        hHilbStep(hpure, hstc, hNstc, hvar, hNvar, p0, 1);
+        hHilbStep(hpure, hstc, hNstc, hvar, hNvar, &p0, 1);
       }
     }
@@ -361 +360 @@
   omFreeSize((ADDRESS)hwork, hNexist * sizeof(scmon));
   hDelete(hexist, hNexist);
-  omFreeBin((ADDRESS)p0,  int_bin);
   if (hisModule!=0)
     omFreeSize((ADDRESS)hstc, hNexist * sizeof(scmon));

kernel/structs.h

@@ -38 +38 @@
 
 /* EXPONENT_TYPE is determined by configure und defined in mod2.h */
-/* the following defines should really go into mod2.h,
-   but configure dislikes it */
-
-#define HAVE_IDI 1
 
 #if defined(SI_CPU_I386) || defined(SI_CPU_X86_64)
@@ -939 +935 @@
   short      lev;
   short      ref;
-#ifdef HAVE_IDI
   int        id_i;
-#endif
 
 #define IDNEXT(a)    ((a)->next)