Changeset 9a6b5d8 in git

Timestamp:

Apr 1, 2003, 5:26:08 PM (21 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

aa7d1f4659603bbc6b039cd719319a80ba36900e

Parents:

87d26115a86e30ac46b6a98bcf3476387cd6dac3

Message:

*hannes: Changes of Christian Meyne


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

File:

• factory/NTLconvert.cc (modified) (5 diffs)

factory/NTLconvert.cc

@@ -1 @@
-/* $Id: NTLconvert.cc,v 1.7 2003-02-14 15:53:26 Singular Exp $ */
+/* $Id: NTLconvert.cc,v 1.8 2003-04-01 15:26:08 Singular Exp $ */
 #include <config.h>
 
@@ -27 +27 @@
 #include "NTLconvert.h"
 
+#ifdef HAVE_OMALLOC
+#define Alloc(L) omAlloc(L)
+#define Free(A,L) omFreeSize(A,L)
+#elif defined(USE_MEMUTIL)
+#include "memutil.h"
+#define Alloc(L) getBlock(L)
+#define Free(A,L) freeBlock(A,L)
+#else
+#define Alloc(L) malloc(L)
+#define Free(A,L) free(A)
+#endif
 ////////////////////////////////////////////////////////////////////////////////
 // NAME: convertFacCF2NTLZZpX                                                 //
@@ -428 +439 @@
   if (cf_stringtemp_l==0)
   {
-    cf_stringtemp=(char *)omAlloc(1023);
-    cf_stringtemp2=(char *)omAlloc(1023);
+    cf_stringtemp=(char *)Alloc(1023);
+    cf_stringtemp2=(char *)Alloc(1023);
     cf_stringtemp[0]='\0';
     cf_stringtemp2[0]='\0';
@@ -473 +484 @@
       if (l>=cf_stringtemp_l-2)
       {
-        omFree(cf_stringtemp2);
-        char *p=(char *)omAlloc(cf_stringtemp_l*2);
+        Free(cf_stringtemp2,cf_stringtemp_l);
+        char *p=(char *)Alloc(cf_stringtemp_l*2);
         memcpy(p,cf_stringtemp,cf_stringtemp_l);
+        Free(cf_stringtemp,cf_stringtemp_l);
         cf_stringtemp_l*=2;
-        omFree(cf_stringtemp);
         cf_stringtemp=p;
-        cf_stringtemp2=(char *)omAlloc(cf_stringtemp_l);
+        cf_stringtemp2=(char *)Alloc(cf_stringtemp_l);
       }
       cf_stringtemp[l-1]=dummy[0];
@@ -558 +569 @@
         gmp_val[0]=getmpi(i.coeff().getval());
         int l=mpz_sizeinbase(gmp_val,10)+2;
-        stringtemp=(char*)omAlloc(l);
+        stringtemp=(char*)Alloc(l);
         stringtemp=mpz_get_str(stringtemp,10,gmp_val);
         conv(temp,stringtemp);
-        omFreeSize(stringtemp,l);
+        Free(stringtemp,l);
 
         //set the computed coefficient