Changeset ed6db89 in git

Timestamp:

Feb 10, 2022, 2:40:09 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

65782418c0356c021cd744b049d8ecf051bd4413

Parents:

f8fe72524e7cccf8d921d7f65918d48ef9be6795

Message:

Revert "omFreeBinAddr -> omFreeBin at some places": bin may be not PolyBin

This reverts commit f29c0dff40e04fa25b05af058273cd20e40d5d2e.

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));
-  omFreeBin (p,currRing->PolyBin);
+  omFreeBinAddr (p);
   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)     omFreeBin(p,r->PolyBin)
+#define p_FreeBinAddr(p, r)     omFreeBinAddr(p)
 #endif
 
@@ -256 +256 @@
 #else
 #define p_AllocBin(p, bin, r)   omTypeAllocBin(poly, p, bin)
-#define p_FreeBinAddr(p, r)     omFreeBin(p,r->PolyBin)
+#define p_FreeBinAddr(p, r)     omFreeBinAddr(p)
 #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);
-  omFreeBin(p,r->PolyBin);
-}
-
+  omFreeBinAddr(p);
+}
+#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);
   poly h = *p;
   *p = pNext(h);
-  omFreeBin(h,r->PolyBin);
-}
-
+  omFreeBinAddr(h);
+}
+#if PDEBUG > 2
 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);
-  omFreeBin(p,r->PolyBin);
+  omFreeBinAddr(p);
   return pnext;
 }
@@ -703 +713 @@
   p_LmCheckPolyRing2(p, r);
   n_Delete(&pGetCoeff(p), r->cf);
-  omFreeBin(p,r->PolyBin);
+  omFreeBinAddr(p);
 }
 static inline void p_LmDelete0(poly p, const ring r)
@@ -709 +719 @@
   p_LmCheckPolyRing2(p, r);
   if (pGetCoeff(p)!=NULL) n_Delete(&pGetCoeff(p), r->cf);
-  omFreeBin(p,r->PolyBin);
+  omFreeBinAddr(p);
 }
 static inline void p_LmDelete(poly *p, const ring r)
@@ -717 +727 @@
   *p = pNext(h);
   n_Delete(&pGetCoeff(h), r->cf);
-  omFreeBin(h,r->PolyBin);
+  omFreeBinAddr(h);
 }
 static inline poly p_LmDeleteAndNext(poly p, const ring r)
@@ -724 +734 @@
   poly pnext = pNext(p);
   n_Delete(&pGetCoeff(p), r->cf);
-  omFreeBin(p,r->PolyBin);
+  omFreeBinAddr(p);
   return pnext;
 }
@@ -1361 +1371 @@
   pSetCoeff0(new_p, pGetCoeff(p));
   pNext(new_p) = pNext(p);
-  omFreeBin(p,r->PolyBin);
+  omFreeBinAddr(p);
   return new_p;
 }