Changeset f29c0d in git

Timestamp:

Feb 7, 2022, 4:03:55 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a8b2d871eda4ca38b58194868427d0199743bba9

Parents:

3ee006a5c95e63a43566c66506a72128b3c79f66

Message:

omFreeBinAddr -> omFreeBin at some places

Files:

• kernel/GBEngine/tgb.cc (modified) (1 diff)
• libpolys/polys/monomials/monomials.h (modified) (3 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (6 diffs)

kernel/GBEngine/tgb.cc

@@ -1171 +1171 @@
   omTypeAllocBin (poly, np, b);
   memmove (np, p, omSizeWOfBin(b) * sizeof (long));
-  omFreeBinAddr (p);
+  omFreeBin (p,currRing->PolyBin);
   return np;
 }

libpolys/polys/monomials/monomials.h

@@ -212 +212 @@
 {                                               \
   omTypeAllocBin(poly, p, bin);                 \
-  p_SetRingOfLm(p, r);                        \
+  p_SetRingOfLm(p, r);                          \
 }                                               \
 while (0)
@@ -218 +218 @@
 #else
 #define p_AllocBin(p, bin, r)   omTypeAllocBin(poly, p, bin)
-#define p_FreeBinAddr(p, r)     omFreeBinAddr(p)
+#define p_FreeBinAddr(p, r)     omFreeBin(p,r->PolyBin)
 #endif
 
@@ -256 +256 @@
 #else
 #define p_AllocBin(p, bin, r)   omTypeAllocBin(poly, p, bin)
-#define p_FreeBinAddr(p, r)     omFreeBinAddr(p)
+#define p_FreeBinAddr(p, r)     omFreeBin(p,r->PolyBin)
 #endif
 

libpolys/polys/monomials/p_polys.h

@@ -678 +678 @@
 }
 
-#if PDEBUG > 2
 static inline void p_LmFree(poly p, ring r)
-#else
-static inline void p_LmFree(poly p, ring)
-#endif
 {
   p_LmCheckPolyRing2(p, r);
-  omFreeBinAddr(p);
-}
-#if PDEBUG > 2
+  omFreeBin(p,r->PolyBin);
+}
+
 static inline void p_LmFree(poly *p, ring r)
-#else
-static inline void p_LmFree(poly *p, ring)
-#endif
 {
   p_LmCheckPolyRing2(*p, r);
   poly h = *p;
   *p = pNext(h);
-  omFreeBinAddr(h);
-}
-#if PDEBUG > 2
+  omFreeBin(h,r->PolyBin);
+}
+
 static inline poly p_LmFreeAndNext(poly p, ring r)
-#else
-static inline poly p_LmFreeAndNext(poly p, ring)
-#endif
 {
   p_LmCheckPolyRing2(p, r);
   poly pnext = pNext(p);
-  omFreeBinAddr(p);
+  omFreeBin(p,r->PolyBin);
   return pnext;
 }
@@ -713 +703 @@
   p_LmCheckPolyRing2(p, r);
   n_Delete(&pGetCoeff(p), r->cf);
-  omFreeBinAddr(p);
+  omFreeBin(p,r->PolyBin);
 }
 static inline void p_LmDelete0(poly p, const ring r)
@@ -719 +709 @@
   p_LmCheckPolyRing2(p, r);
   if (pGetCoeff(p)!=NULL) n_Delete(&pGetCoeff(p), r->cf);
-  omFreeBinAddr(p);
+  omFreeBin(p,r->PolyBin);
 }
 static inline void p_LmDelete(poly *p, const ring r)
@@ -727 +717 @@
   *p = pNext(h);
   n_Delete(&pGetCoeff(h), r->cf);
-  omFreeBinAddr(h);
+  omFreeBin(h,r->PolyBin);
 }
 static inline poly p_LmDeleteAndNext(poly p, const ring r)
@@ -734 +724 @@
   poly pnext = pNext(p);
   n_Delete(&pGetCoeff(p), r->cf);
-  omFreeBinAddr(p);
+  omFreeBin(p,r->PolyBin);
   return pnext;
 }
@@ -1371 +1361 @@
   pSetCoeff0(new_p, pGetCoeff(p));
   pNext(new_p) = pNext(p);
-  omFreeBinAddr(p);
+  omFreeBin(p,r->PolyBin);
   return new_p;
 }