Changeset b4c464c in git

Timestamp:

Nov 26, 2012, 2:09:09 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

e12d106a70736a96de005699524e86b37b9e9c98

Parents:

c8101dfa6b8a68e78189a8722b9816e986c97857

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-11-26 14:09:09+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-11-26 14:09:52+01:00

Message:

fix: tr. #463 (from master)

Files:

• kernel/hutil.cc (modified) (1 diff)
• libpolys/polys/nc/old.gring.cc (modified) (5 diffs)

kernel/hutil.cc

@@ -1025 +1025 @@
   if ((x==NULL) || (lm > lx))
   {
-    if ((x!=NULL)&&(lx>0)) omFreeSize((ADDRESS)x, lx * sizeof(scmon));
+    /* according to http://www.singular.uni-kl.de:8002/trac/ticket/463#comment:4
+     * we need to work around a compiler bug:
+    * if ((x!=NULL)&&(lx>0)) omFreeSize((ADDRESS)x, lx * sizeof(scmon));
+    */
+    if (x!=NULL) if (lx>0) omFreeSize((ADDRESS)x, lx * sizeof(scmon));
     monmem->mo = x = (scfmon)omAlloc(lm * sizeof(scmon));
     monmem->a = lm;

libpolys/polys/nc/old.gring.cc

@@ -48 +48 @@
 
 #include <polys/operations/p_Mult_q.h>
-// dirty tricks:
-#include <polys/templates/p_MemAdd.h>
 
 // #include <polys/pInline1.h>
@@ -465 +463 @@
   int iF,jG,iG;
   int rN=r->N;
-  int ExpSize=(((rN+1)*sizeof(int)+sizeof(long)-1)/sizeof(long))*sizeof(long);
 
   int *F=(int *)omAlloc0((rN+1)*sizeof(int));
@@ -474 +471 @@
   memcpy(G, G0,(rN+1)*sizeof(int));
   //  pExpVectorCopy(G,G0);
-  F[0]=0; /* important for p_MemAdd */
+  F[0]=0; 
   G[0]=0;
 
@@ -498 +495 @@
     /* i.e. no mixed exp_num , MERGE case */
   {
-    p_MemAdd_LengthGeneral(F, G, ExpSize/sizeof(long));
+    { for(int ii=rN;ii>0;ii--) F[ii]+=G[ii]; }
     p_SetExpV(out,F,r);
     p_Setm(out,r);
-    //    omFreeSize((ADDRESS)F,ExpSize);
     freeT(F,rN);
     freeT(G,rN);
@@ -560 +556 @@
       cff=totcff;
     }
-    p_MemAdd_LengthGeneral(F, G, ExpSize/sizeof(long));
+    { for(int ii=rN;ii>0;ii--) F[ii]+=G[ii]; }
     p_SetExpV(out,F,r);
     p_Setm(out,r);
     p_SetCoeff(out,cff,r);
-    //    p_MemAdd_NegWeightAdjust(p, r); ??? do we need this?
     freeT(F,rN);
     freeT(G,rN);