Changeset 13a03b in git


Ignore:
Timestamp:
Jul 22, 2013, 3:15:35 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')
Children:
26fc598971dac7165d7ec99eec29433a9e8b942849794829535b253175e833f91be5cd14dc92e009f052a168e8609d4cc9eec8ff570e13cf79d60b7c
Parents:
e9d5816a25c4fe63e13faa13802756f808bbf9bf
Message:
fix: compiler warnings
Location:
Singular
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Singular/misc_ip.cc

    re9d581 r13a03b  
    4949    && (mpz_cmp_si(n,(long)ui)==0))
    5050    {
    51       L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)ui;
     51      L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)(long)ui;
    5252      return;
    5353    }
    … …  
    6363  if ((((unsigned long)i)==ui) && (((i<<3)>>3)==i))
    6464  {
    65     L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)i;
     65    L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)(long)i;
    6666  }
    6767  else

  • Singular/pcv.cc

    re9d581 r13a03b  
    149149    {
    150150      res->rtyp=INT_CMD;
    151       res->data=(void*)pcvMinDeg((poly)h->Data());
     151      res->data=(void*)(long)pcvMinDeg((poly)h->Data());
    152152      return FALSE;
    153153    }
    … …  
    156156    {
    157157      res->rtyp=INT_CMD;
    158       res->data=(void*)pcvMinDeg((matrix)h->Data());
     158      res->data=(void*)(long)pcvMinDeg((matrix)h->Data());
    159159      return FALSE;
    160160    }
    … …  
    400400        int d1=(int)(long)h->Data();
    401401        res->rtyp=INT_CMD;
    402         res->data=(void*)pcvDim(d0,d1);
     402        res->data=(void*)(long)pcvDim(d0,d1);
    403403        return FALSE;
    404404      }

  • Singular/pyobject.cc

    re9d581 r13a03b  
    101101  {
    102102    // Sone python modules needs argc, argv set for some reason
    103     char* argv = "";
     103    char* argv = (char*)"";
    104104    PySys_SetArgv(1, &argv);
    105105    PyRun_SimpleString("from sys import path, modules");
    … …  
    256256    PyErr_Fetch(&pType, &pMessage, &pTraceback);
    257257   
    258     Werror("pyobject error occured");
    259     Werror(PyString_AsString(pMessage));
     258    WerrorS("pyobject error occured");
     259    WerrorS(PyString_AsString(pMessage));
    260260   
    261261    Py_XDECREF(pType);
    … …  
    580580    case '<': case '>': case EQUAL_EQUAL: case NOTEQUAL: case GE: case LE:
    581581    {
    582       res->data = (void *)lhs.compare(op, PythonCastDynamic(arg2));
     582      res->data = (void *)(long)(lhs.compare(op, PythonCastDynamic(arg2)));
    583583      res->rtyp = INT_CMD;
    584584      return FALSE;
Note: See TracChangeset for help on using the changeset viewer.