Changeset 805db88 in git


Ignore:
Timestamp:
Nov 14, 2013, 7:57:20 PM (9 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
4b5171ff486c46e0d3f30c8810fc2bb7ebd00157
Parents:
b5f27dd8b00738efde14a72f129d4b6173d951f4
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-14 19:57:20+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-11-15 14:58:04+01:00
Message:
Avoid "if ((P)) " since clang treats such statements specially
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    rb5f27dd r805db88  
    30383038
    30393039  maxl--;
    3040   if ((maxl==-1) /*&& (iiOp!=MRES_CMD)*/)
     3040  if (/*(*/ maxl==-1 /*)*/) /*&& (iiOp!=MRES_CMD)*/
    30413041  {
    30423042    maxl = currRing->N-1+2*(iiOp==MRES_CMD);
     
    31533153
    31543154  maxl--;
    3155   if ((maxl==-1) /*&& (iiOp!=MRES_CMD)*/)
     3155  if (/*(*/ maxl==-1 /*)*/) /*&& (iiOp!=MRES_CMD)*/
    31563156  {
    31573157    maxl = currRing->N-1+2*(iiOp==MRES_CMD);
  • Singular/ipassign.cc

    rb5f27dd r805db88  
    502502static BOOLEAN jiA_1x1INTMAT(leftv res, leftv a,Subexpr e)
    503503{
    504   if ((res->rtyp!=INTMAT_CMD) /*|| (e!=NULL) - TRUE because of type int */)
     504  if (/*(*/ res->rtyp!=INTMAT_CMD /*)*/) /*|| (e!=NULL) - TRUE because of type int */
    505505  {
    506506    // no error message: assignment simply fails
     
    524524static BOOLEAN jiA_1x1MATRIX(leftv res, leftv a,Subexpr e)
    525525{
    526   if ((res->rtyp!=MATRIX_CMD) /*|| (e!=NULL) - TRUE because of type poly */)
     526  if (/*(*/ res->rtyp!=MATRIX_CMD /*)*/) /*|| (e!=NULL) - TRUE because of type poly */
    527527  {
    528528    // no error message: assignment simply fails
     
    846846
    847847  int lt=l->Typ();
    848   if((lt==0)/*&&(l->name!=NULL)*/)
     848  if (/*(*/ lt==0 /*)*/) /*&&(l->name!=NULL)*/
    849849  {
    850850    if (!errorreported) Werror("left side `%s` is undefined",l->Fullname());
  • Singular/maps_ip.cc

    rb5f27dd r805db88  
    117117        res->data=(void *)prCopyR( (poly)data, preimage_r, currRing);
    118118      else
    119       if ((what==IMAP_CMD) || ((what==FETCH_CMD) /* && (nMap!=nCopy)*/))
     119        if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
    120120        res->data=(void *)p_PermPoly((poly)data,perm,preimage_r,currRing, nMap,par_perm,P);
    121121      else /*if (what==MAP_CMD)*/
     
    155155      }
    156156      else
    157       if ((what==IMAP_CMD) || ((what==FETCH_CMD) /* && (nMap!=nCopy)*/))
     157        if ( (what==IMAP_CMD) || /*(*/ (what==FETCH_CMD) /*)*/) /* && (nMap!=nCopy)*/
    158158      {
    159159        for (i=R*C-1;i>=0;i--)
  • dyn_modules/callgfanlib/gfan.cc

    rb5f27dd r805db88  
    16881688        ring tmpRing;
    16891689
    1690         if( (srcRing->order[0]!=ringorder_a))
     1690        if(  /*(*/ srcRing->order[0]!=ringorder_a /*)*/ )
    16911691        {
    16921692                int64vec *iv;// = new int64vec(this->numVars);
  • dyn_modules/syzextra/mod_main.cc

    rb5f27dd r805db88  
    701701  const int pos = rGetISPos(p, r);
    702702
    703   if( (-1 == pos) )
     703  if(  /*(*/ -1 == pos /*)*/ )
    704704  {
    705705    WerrorS("`GetInducedData([int])` called on incompatible ring (not created by 'MakeInducedSchreyerOrdering'!)");
     
    777777  const int posIS = rGetISPos(p, r);
    778778
    779   if( (-1 == posIS) )
     779  if(  /*(*/ -1 == posIS /*)*/ )
    780780  {
    781781    WerrorS("`SetInducedReferrence(<ideal/module>, [int[, int]])` called on incompatible ring (not created by 'MakeInducedSchreyerOrdering'!)");
  • factory/libfac/factor/Factor.cc

    rb5f27dd r805db88  
    845845  // search an "optimal" main variavble
    846846  int mv=F.level();
    847   if ((mv != LEVELBASE) /* && (! F.isUnivariate()) */)
     847  if (/*(*/ mv != LEVELBASE /*)*/) /* && (! F.isUnivariate()) */
    848848  {
    849849     mv=find_mvar(F);
  • factory/libfac/factor/SqrFree.cc

    rb5f27dd r805db88  
    219219  for (int k=1; k<=n; k++)
    220220  {
    221     if ((mipo.isZero())/*||(k!=1)*/)
     221    if (/*(*/ mipo.isZero() /*)*/) /*||(k!=1)*/
    222222    {
    223223      g = swapvar(f,k,n); g = content(g);
     
    266266    for (int k=1; k<=n; k++)
    267267    {
    268       if ((mipo.isZero())/*||(k!=1)*/)
     268      if (/*(*/ mipo.isZero() /*)*/) /*||(k!=1)*/
    269269      {
    270270        g=swapvar(f,k,n) ;
  • kernel/fast_maps.cc

    rb5f27dd r805db88  
    469469        return NULL;
    470470      }
    471       if ((p==NULL) /* && (e>0)*/)
     471      if (/*(*/ p==NULL /*)*/) /* && (e>0)*/
    472472      {
    473473        p=p_Copy(pp /*dest_id[i-1]*/,dest_r);
     
    715715  {
    716716    choice=iter->next;
    717     if ((iter->f1==NULL))
     717    if ( /*(*/ iter->f1==NULL /*)*/ )
    718718    {
    719719      ggT=maFindBestggT(iter, choice, fp, fq,src_r);
  • kernel/ideals.cc

    rb5f27dd r805db88  
    12191219  intvec * weights;
    12201220  hom = (tHomog)idHomModule(h1,currQuotient,&weights);
    1221   if (/**addOnlyOne &&*/ (!h1IsStb))
     1221  if /**addOnlyOne &&*/ (/*(*/ !h1IsStb /*)*/)
    12221222    temph1 = kStd(h1,currQuotient,hom,&weights,NULL);
    12231223  else
  • kernel/syz0.cc

    rb5f27dd r805db88  
    910910//idPrint(res[syzIndex+1]);
    911911
    912     if ((syzIndex==0))
     912    if ( /*(*/ syzIndex==0 /*)*/ )
    913913    {
    914914      if ((hom==isHomog)|| (rHasGlobalOrdering(origR)))
  • kernel/tgb_internal.h

    rb5f27dd r805db88  
    11101110   {
    11111111     MonRedResNP<number_type> red=mon[i];
    1112      if ((red.ref))
     1112     if ( /*(*/ red.ref /*)*/ )
    11131113     {
    11141114       if (red.ref->row)
     
    19531953  if (res_holder){
    19541954    succ=TRUE;
    1955     if ((res_holder->value_len==backLinkCode)){
     1955    if ( /*(*/ res_holder->value_len==backLinkCode /*)*/ ){
    19561956      len=1;
    19571957      return term;
  • kernel/walkSupport.cc

    rb5f27dd r805db88  
    11231123      (*res)[j]=(int64)weights[j];
    11241124  }
    1125   else if( (r->order[0]==ringorder_a64) )
     1125  else if(  /*(*/ r->order[0]==ringorder_a64 /*)*/ )
    11261126  {
    11271127    int64* weights=(int64*)r->wvhdl[0];
  • libpolys/coeffs/modulop.cc

    rb5f27dd r805db88  
    539539                               % r->ch);
    540540          r->npLogTable[r->npExpTable[i]] = i;
    541           if (/*(i == r->ch - 1 ) ||*/ (r->npExpTable[i] == 1))
     541          if /*(i == r->ch - 1 ) ||*/ (/*(*/ r->npExpTable[i] == 1 /*)*/)
    542542            break;
    543543        }
  • libpolys/polys/ext_fields/transext.cc

    rb5f27dd r805db88  
    15141514void ntNormalize (number &a, const coeffs cf)
    15151515{
    1516   if ((a!=NULL))
     1516  if ( /*(*/ a!=NULL /*)*/ )
    15171517  {
    15181518    definiteGcdCancellation(a, cf, FALSE);
  • libpolys/polys/nc/sca.cc

    rb5f27dd r805db88  
    477477#endif
    478478
    479   if( ( pPoly == NULL ) /*|| ( pMonom == NULL )*/ )
     479  if (/*(*/  pPoly == NULL  /*)*/) /*|| ( pMonom == NULL )*/
    480480    return NULL;
    481481
Note: See TracChangeset for help on using the changeset viewer.