Changeset c5e5e7f in git


Ignore:
Timestamp:
Sep 21, 2006, 7:08:48 PM (18 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
09bbf540858ad0483955c1f09edd84fad0b43597
Parents:
dc25e4e6439781ca09a13e737f526f525db44d23
Message:
*hannes: 64bit stuff


git-svn-id: file:///usr/local/Singular/svn/trunk@9421 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/iparith.cc

    rdc25e4 rc5e5e7f  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.409 2006-09-21 16:00:10 Singular Exp $ */
     4/* $Id: iparith.cc,v 1.410 2006-09-21 17:08:48 Singular Exp $ */
    55
    66/*
     
    519519  if (r==0)
    520520  {
     521    number h=nSub(pGetCoeff(p),pGetCoeff(q));
    521522    /* compare lead coeffs */
    522     number h=nSub(pGetCoeff(p),pGetCoeff(q));
    523523    r = -1+nIsZero(h)+2*nGreaterZero(h); /* -1: <, 0:==, 1: > */
    524524    nDelete(&h);
     
    637637        WarnS("int overflow(^), result may be wrong");
    638638    }
    639     res->data = (char *)rc;
     639    res->data = (char *)((long)rc);
    640640    if (u!=NULL) return jjOP_REST(res,u,v);
    641641    return FALSE;
     
    808808  unsigned int b=(unsigned int)(unsigned long)v->Data();
    809809  unsigned int c=a+b;
    810   res->data = (char *)c;
     810  res->data = (char *)((long)c);
    811811  if (((Sy_bit(31)&a)==(Sy_bit(31)&b))&&((Sy_bit(31)&a)!=(Sy_bit(31)&c)))
    812812  {
     
    890890    WarnS("int overflow(-), result may be wrong");
    891891  }
    892   res->data = (char *)c;
     892  res->data = (char *)((long)c);
    893893  return jjPLUSMINUS_Gen(res,u,v);
    894894}
     
    936936  if ((b!=0) && (c/b !=a))
    937937    WarnS("int overflow(*), result may be wrong");
    938   res->data = (char *)c;
     938  res->data = (char *)((long)c);
    939939  if ((u->Next()!=NULL) || (v->Next()!=NULL))
    940940    return jjOP_REST(res,u,v);
     
    11171117        r= (a / b);     break;
    11181118  }
    1119   res->data=(void *)r;
     1119  res->data=(void *)((long)r);
    11201120  return FALSE;
    11211121}
     
    12531253static BOOLEAN jjEQUAL_Ma(leftv res, leftv u, leftv v)
    12541254{
    1255   res->data = (char *)mpEqual((matrix)u->Data(),(matrix)v->Data());
     1255  res->data = (char *)((long)mpEqual((matrix)u->Data(),(matrix)v->Data()));
    12561256  jjEQUAL_REST(res,u,v);
    12571257  return FALSE;
     
    12591259static BOOLEAN jjEQUAL_N(leftv res, leftv u, leftv v)
    12601260{
    1261   res->data = (char *)nEqual((number)u->Data(),(number)v->Data());
     1261  res->data = (char *)((long)nEqual((number)u->Data(),(number)v->Data()));
    12621262  jjEQUAL_REST(res,u,v);
    12631263  return FALSE;
     
    12671267  poly p=(poly)u->Data();
    12681268  poly q=(poly)v->Data();
    1269   res->data = (char *) (pEqualPolys(p,q));
     1269  res->data = (char *) ((long)pEqualPolys(p,q));
    12701270  jjEQUAL_REST(res,u,v);
    12711271  return FALSE;
     
    13261326  for (i=0;i<iv->length(); i++)
    13271327  {
    1328     t.data=(char *)(*iv)[i];
     1328    t.data=(char *)((long)(*iv)[i]);
    13291329    if (p==NULL)
    13301330    {
     
    14771477  leftv p=NULL;
    14781478  int i;
    1479   int slen = strlen(u->name) + 14;
     1479  long slen = strlen(u->name) + 14;
    14801480  char *n = (char*) omAlloc(slen);
    14811481
     
    16341634  for(i=IDELEMS(I);i>=0;i--) d=si_max(d,(int)pDegW(I->m[i],iv));
    16351635  omFreeSize((ADDRESS)iv,(pVariables+1)*sizeof(short));
    1636   res->data = (char *)d;
     1636  res->data = (char *)((long)d);
    16371637  return FALSE;
    16381638}
     
    16751675  assumeStdFlag(v);
    16761676  if(currQuotient==NULL)
    1677     res->data = (char *)scDimInt((ideal)(v->Data()),(ideal)w->Data());
     1677    res->data = (char *)((long)scDimInt((ideal)(v->Data()),(ideal)w->Data()));
    16781678  else
    16791679  {
    16801680    ideal q=idSimpleAdd(currQuotient,(ideal)w->Data());
    1681     res->data = (char *)scDimInt((ideal)(v->Data()),q);
     1681    res->data = (char *)((long)scDimInt((ideal)(v->Data()),q));
    16821682    idDelete(&q);
    16831683  }
     
    17601760  lists L=(lists)omAllocBin(slists_bin);
    17611761  L->Init(3);
    1762   L->m[0].rtyp=INT_CMD;   L->m[0].data=(void *)p0;
    1763   L->m[1].rtyp=INT_CMD;   L->m[1].data=(void *)a;
    1764   L->m[2].rtyp=INT_CMD;   L->m[2].data=(void *)b;
     1762  L->m[0].rtyp=INT_CMD;   L->m[0].data=(void *)(long)p0;
     1763  L->m[1].rtyp=INT_CMD;   L->m[1].data=(void *)(long)a;
     1764  L->m[2].rtyp=INT_CMD;   L->m[2].data=(void *)(long)b;
    17651765  res->rtyp=LIST_CMD;
    17661766  res->data=(char *)L;
     
    19401940  }
    19411941  res->rtyp=INT_CMD;
    1942   res->data=(char *)p0;
     1942  res->data=(char *)(long)p0;
    19431943  return FALSE;
    19441944}
Note: See TracChangeset for help on using the changeset viewer.