Changeset 20a351 in git


Ignore:
Timestamp:
Feb 24, 2010, 12:14:52 PM (13 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
710469e33da8554c00e953aa1f5227161c8a1286
Parents:
089b983e63f3a9d3476752f2fcebcd1b5cccd2cf
Message:
fix gcc warnings

git-svn-id: file:///usr/local/Singular/svn/trunk@12563 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Singular/mpsr_PutPoly.cc

    r089b98 r20a351  
    318318  if (r->qideal != NULL) annots++;
    319319  // we sent the minpoly with the coefficient ring
    320   if (r->minpoly != NULL & r->parameter == NULL) annots++;
     320  if ((r->minpoly != NULL) && (r->parameter == NULL)) annots++;
    321321
    322322  return annots;

  • Singular/wrapper.cc

    r089b98 r20a351  
    5252{
    5353  ideal result;
    54   int dpO;
    5554
    5655  jList *T;
    … …  
    7170  if (!jInitBasis(I,&T,&Q))
    7271  {
    73     dpO=(strstr(rOrdStr(currRing),"dp")!=NULL);
     72    int dpO=(strstr(rOrdStr(currRing),"dp")!=NULL);
    7473    int ideal_length;
    7574    if (flag==1)
    … …  
    111110      iT=iT->next;
    112111    }
     112
     113    if ((flag==1) && (dpO==0))
     114    {
     115      //Print ("interred\n");
     116      result=kInterRedOld(result);
     117      idSkipZeroes(result);
     118    }
     119    res->data = (char *)result;
     120    res->rtyp = IDEAL_CMD;
     121    DestroyList(Q);
     122    DestroyList(T);
     123    return FALSE;
    113124  }
    114 
    115   if ((flag==1) && (!dpO))
    116   {
    117     //Print ("interred\n");
    118     result=kInterRedOld(result);
    119     idSkipZeroes(result);
    120   }
    121   res->data = (char *)result;
    122   res->rtyp = IDEAL_CMD;
    123 
    124   DestroyList(Q);
    125   DestroyList(T);
    126 
    127   return FALSE;
     125  else
     126    return TRUE;
    128127
    129128zero:
Note: See TracChangeset for help on using the changeset viewer.