Changeset 2e06def in git


Ignore:
Timestamp:
Nov 28, 2012, 6:35:26 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
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:
1 edited

Legend:

Unmodified
Added
Removed
  • libpolys/polys/pDebug.cc

    r0db7c7 r2e06def  
    8686    else
    8787    #endif
     88    #ifndef X_OMALLOC
    8889    {
    8990      _pPolyAssumeReturn(omIsBinPageAddr(p) && omSizeWOfAddr(p)==omSizeWOfBin(r->PolyBin),p,r);
     
    9192    }
    9293    return FALSE;
     94    #endif
    9395  }
    9496  return TRUE;
     
    107109BOOLEAN p_CheckPolyRing(poly p, ring r)
    108110{
     111  #ifndef X_OMALLOC
    109112  pAssumeReturn(r != NULL && r->PolyBin != NULL);
     113  #endif
    110114  return p_CheckIsFromRing(p, r);
    111115}
     
    113117BOOLEAN p_LmCheckPolyRing(poly p, ring r)
    114118{
     119  #ifndef X_OMALLOC
    115120  pAssumeReturn(r != NULL && r->PolyBin != NULL);
     121  #endif
    116122  pAssumeReturn(p != NULL);
    117123  return p_LmCheckIsFromRing(p, r);
     
    119125BOOLEAN p_CheckRing(ring r)
    120126{
     127  #ifndef X_OMALLOC
    121128  pAssumeReturn(r != NULL && r->PolyBin != NULL);
     129  #endif
    122130  return TRUE;
    123131}
     
    209217
    210218  #ifndef OM_NDEBUG
     219  #ifndef X_OMALLOC
    211220  // check addr with level+1 so as to check bin/page of addr
    212221  _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (omSizeWOfBin(r->PolyBin))*SIZEOF_LONG, level+1)
    213222                        == omError_NoError, "memory error",p,r);
     223  #endif
    214224  #endif
    215225
     
    229239    pFalseReturn(p_LmCheckIsFromRing(p, r));
    230240    #ifndef OM_NDEBUG
     241    #ifndef X_OMALLOC
    231242    // omAddr check
    232243    _pPolyAssumeReturnMsg(omTestBinAddrSize(p, (omSizeWOfBin(r->PolyBin))*SIZEOF_LONG, 1)
    233244                     == omError_NoError, "memory error",p,r);
     245    #endif
    234246    #endif
    235247    // number/coef check
Note: See TracChangeset for help on using the changeset viewer.