Changeset 2e06def in git

Timestamp:

Nov 28, 2012, 6:35:26 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2e984a6cbf8ed1e42ed3c9d1ef5cee27a2a33027

Parents:

0db7c7f2e754ddf2f703ec57b6fc76b5bf1e673f

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-11-28 18:35:26+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-11-28 18:35:47+01:00

Message:

fixes for xalloc

File:

• libpolys/polys/pDebug.cc (modified) (7 diffs)

libpolys/polys/pDebug.cc

@@ -86 +86 @@
     else
     #endif
+    #ifndef X_OMALLOC
     {
       _pPolyAssumeReturn(omIsBinPageAddr(p) && omSizeWOfAddr(p)==omSizeWOfBin(r->PolyBin),p,r);
@@ -91 +92 @@
     }
     return FALSE;
+    #endif
   }
   return TRUE;
@@ -107 +109 @@
 BOOLEAN p_CheckPolyRing(poly p, ring r)
 {
+  #ifndef X_OMALLOC
   pAssumeReturn(r != NULL && r->PolyBin != NULL);
+  #endif
   return p_CheckIsFromRing(p, r);
 }
@@ -113 +117 @@
 BOOLEAN p_LmCheckPolyRing(poly p, ring r)
 {
+  #ifndef X_OMALLOC
   pAssumeReturn(r != NULL && r->PolyBin != NULL);
+  #endif
   pAssumeReturn(p != NULL);
   return p_LmCheckIsFromRing(p, r);
@@ -119 +125 @@
 BOOLEAN p_CheckRing(ring r)
 {
+  #ifndef X_OMALLOC
   pAssumeReturn(r != NULL && r->PolyBin != NULL);
+  #endif
   return TRUE;
 }
@@ -209 +217 @@
 
   #ifndef OM_NDEBUG
+  #ifndef X_OMALLOC
   // check addr with level+1 so as to check bin/page of addr
   _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (omSizeWOfBin(r->PolyBin))*SIZEOF_LONG, level+1)
                         == omError_NoError, "memory error",p,r);
+  #endif
   #endif
 
@@ -229 +239 @@
     pFalseReturn(p_LmCheckIsFromRing(p, r));
     #ifndef OM_NDEBUG
+    #ifndef X_OMALLOC
     // omAddr check
     _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (omSizeWOfBin(r->PolyBin))*SIZEOF_LONG, 1)
                      == omError_NoError, "memory error",p,r);
+    #endif
     #endif
     // number/coef check