Changeset a44806 in git


Ignore:
Timestamp:
Jul 30, 2013, 5:57:59 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
70cc24be4069e6e8582f4cd0ed1d5daefc6408c3
Parents:
5179a06789400d6b00d11f07b45be960d7c06e4c
Message:
chg: toward a removal of kernel/longrat.h
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • Singular/bigintm.cc

    r5179a0 ra44806  
    1212#include <omalloc/omalloc.h>
    1313#include <kernel/febase.h>
    14 #include <kernel/longrat.h>
     14#include <libpolys/coeffs//longrat.h>
    1515#include <Singular/subexpr.h>
    1616#include <Singular/bigintm.h>

  • Singular/extra.cc

    r5179a0 ra44806  
    783783            r--;
    784784          res->rtyp = INT_CMD;
    785           res->data = (void*)r;
     785          res->data = (void*)(long)r;
    786786          return FALSE;
    787787        }
    … …  
    948948        {
    949949          ll->Init(3);
    950           ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)solvable;
     950          ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)(long)solvable;
    951951          ll->m[1].rtyp=MATRIX_CMD; ll->m[1].data=(void *)xVec;
    952952          ll->m[2].rtyp=MATRIX_CMD; ll->m[2].data=(void *)homogSolSpace;
    … …  
    955955        {
    956956          ll->Init(1);
    957           ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)solvable;
     957          ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)(long)solvable;
    958958        }
    959959        res->rtyp = LIST_CMD;
    … …  
    971971          int n = slStatusSsiL(L, timeMillisec * 1000);
    972972          res->rtyp = INT_CMD;
    973           res->data = (void*)n;
     973          res->data = (void*)(long)n;
    974974          return FALSE;
    975975        }
    … …  
    12521252
    12531253        if ((h!=NULL) && (h->Typ()==INT_CMD))
    1254           res->data=(void *)setNCExtensions( (int)((long)(h->Data())) );
     1254          res->data=(void *)(long)setNCExtensions( (int)((long)(h->Data())) );
    12551255        else
    1256           res->data=(void *)getNCExtensions();
     1256          res->data=(void *)(long)getNCExtensions();
    12571257
    12581258        res->rtyp=INT_CMD;
    … …  
    12661266
    12671267        if( rIsPluralRing(currRing) )
    1268           res->data=(void *)ncRingType(currRing);
     1268          res->data=(void *)(long)ncRingType(currRing);
    12691269        else
    1270           res->data=(void *)(-1);
     1270          res->data=(void *)(-1L);
    12711271
    12721272        return FALSE;
    … …  
    14431443                                           ((intvec*) h->next->Data()),
    14441444                                           (ideal) h->next->next->Data());
    1445         if (res->data == (void*) 0 || res->data == (void*) 1)
     1445        if (res->data == NULL || res->data == (void*) 1L)
    14461446        {
    14471447          res->rtyp = INT_CMD;
    … …  
    25472547          rComplete(currRing);
    25482548          res->rtyp = INT_CMD;
    2549           res->data = 0;
     2549          res->data = (void*)0L;
    25502550          return FALSE;
    25512551        }
    … …  
    28602860        L->m[0].data=(void *)omStrDup(r.nZahl);
    28612861        L->m[1].rtyp=INT_CMD;
    2862         L->m[1].data=(void *)r.achse;          // flag for unoccupied axes
     2862        L->m[1].data=(void *)(long)r.achse;          // flag for unoccupied axes
    28632863        L->m[2].rtyp=INT_CMD;
    2864         L->m[2].data=(void *)r.deg;            // #degenerations
     2864        L->m[2].data=(void *)(long)r.deg;            // #degenerations
    28652865        if ( r.deg != 0)              // only if degenerations exist
    28662866        {
    28672867          L->m[3].rtyp=INT_CMD;
    2868           L->m[3].data=(void *)r.anz_punkte;     // #points
     2868          L->m[3].data=(void *)(long)r.anz_punkte;     // #points
    28692869          //---<>--number of points------
    28702870          int anz = r.anz_punkte;    // number of points

  • Singular/grammar.cc

    r5179a0 ra44806  
    108108#include <kernel/syz.h>
    109109#include <Singular/lists.h>
    110 #include <kernel/longrat.h>
     110#include <libpolys/coeffs/longrat.h>
    111111#include <Singular/libparse.h>
    112112#include <coeffs/bigintmat.h>

  • Singular/grammar.y

    r5179a0 ra44806  
    4444#include <kernel/syz.h>
    4545#include <Singular/lists.h>
    46 #include <kernel/longrat.h>
     46#include <libpolys/coeffs/longrat.h>
    4747#include <Singular/libparse.h>
    4848#include <coeffs/bigintmat.h>

  • Singular/interpolation.cc

    r5179a0 ra44806  
    2020#include <coeffs/longrat.h>
    2121
    22 #include <kernel/longrat.h>
    2322#include <kernel/febase.h>
    2423#include <kernel/ideals.h>

  • Singular/iparith.cc

    r5179a0 ra44806  
    51605160static BOOLEAN jjUNIVARIATE(leftv res, leftv v)
    51615161{
    5162   res->data=(char *)pIsUnivariate((poly)v->Data());
     5162  res->data=(char *)(long)pIsUnivariate((poly)v->Data());
    51635163  return FALSE;
    51645164}
    … …  
    53815381static BOOLEAN jjpLength(leftv res, leftv v)
    53825382{
    5383   res->data = (char *)pLength((poly)v->Data());
     5383  res->data = (char *)(long)pLength((poly)v->Data());
    53845384  return FALSE;
    53855385}
    53865386static BOOLEAN jjidElem(leftv res, leftv v)
    53875387{
    5388   res->data = (char *)idElem((ideal)v->Data());
     5388  res->data = (char *)(long)idElem((ideal)v->Data());
    53895389  return FALSE;
    53905390}
    … …  
    54635463static BOOLEAN jjCOUNT_RES(leftv res, leftv v)
    54645464{
    5465   res->data=(char *)sySize((syStrategy)v->Data());
     5465  res->data=(char *)(long)sySize((syStrategy)v->Data());
    54665466  return FALSE;
    54675467}
    54685468static BOOLEAN jjDIM_R(leftv res, leftv v)
    54695469{
    5470   res->data = (char *)syDim((syStrategy)v->Data());
     5470  res->data = (char *)(long)syDim((syStrategy)v->Data());
    54715471  return FALSE;
    54725472}
    … …  
    70777077  {
    70787078    ll->Init(2);
    7079     ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)invertible;
     7079    ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)(long)invertible;
    70807080    ll->m[1].rtyp=MATRIX_CMD; ll->m[1].data=(void *)iMat;
    70817081  }
    … …  
    70837083  {
    70847084    ll->Init(1);
    7085     ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)invertible;
     7085    ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)(long)invertible;
    70867086  }
    70877087
    … …  
    71617161  {
    71627162    ll->Init(3);
    7163     ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)solvable;
     7163    ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)(long)solvable;
    71647164    ll->m[1].rtyp=MATRIX_CMD; ll->m[1].data=(void *)xVec;
    71657165    ll->m[2].rtyp=MATRIX_CMD; ll->m[2].data=(void *)homogSolSpace;
    … …  
    71687168  {
    71697169    ll->Init(1);
    7170     ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)solvable;
     7170    ll->m[0].rtyp=INT_CMD;    ll->m[0].data=(void *)(long)solvable;
    71717171  }
    71727172

  • Singular/ipid.cc

    r5179a0 ra44806  
    2525
    2626#include <kernel/febase.h>
    27 #include <kernel/longrat.h>
     27#include <libpolys/coeffs/longrat.h>
    2828#include <kernel/polys.h>
    2929#include <kernel/ideals.h>

  • Singular/ipshell.cc

    r5179a0 ra44806  
    952952  res->data=(char *)syBetti(r,len,&reg,weights,(int)(long)v->Data());
    953953  omFreeSize((ADDRESS)r,(len)*sizeof(ideal));
    954   atSet(res,omStrDup("rowShift"),(void*)add_row_shift,INT_CMD);
     954  atSet(res,omStrDup("rowShift"),(void*)(long)add_row_shift,INT_CMD);
    955955  if (weights!=NULL) delete weights;
    956956  return FALSE;
    … …  
    16141614  // 0: char/ cf - ring
    16151615  L->m[0].rtyp=INT_CMD;
    1616   L->m[0].data=(void *)r->cf->ch;
     1616  L->m[0].data=(void *)(long)r->cf->ch;
    16171617  // ----------------------------------------
    16181618  // 1: list (var)

  • Singular/janet.cc

    r5179a0 ra44806  
    1818
    1919#include <kernel/ideals.h>
    20 #include <kernel/longrat.h>
     20#include <libpolys/coeffs/longrat.h>
    2121#include <kernel/febase.h>
    2222#include <kernel/kutil.h>

  • Singular/libsingular.h

    r5179a0 ra44806  
    77#include <kernel/structs.h>
    88#include <kernel/polys.h>
    9 #include <kernel/longrat.h>
    109#include <coeffs/numbers.h>
     10#include <libpolys/coeffs/longrat.h>
    1111#include <kernel/febase.h>
    1212#include <polys/monomials/ring.h>

  • Singular/subexpr.cc

    r5179a0 ra44806  
    3232#include <kernel/polys.h>
    3333
    34 #include <kernel/longrat.h>
     34#include <libpolys/coeffs/longrat.h>
    3535// #include <coeffs/longrat.h>
    3636

  • kernel/ideals.cc

    r5179a0 ra44806  
    4343#include <kernel/syz.h>
    4444
    45 #include <kernel/longrat.h>
     45#include <libpolys/coeffs/longrat.h>
    4646
    4747

  • kernel/tgb.cc

    r5179a0 ra44806  
    3030#include <polys/nc/sca.h>
    3131#include <polys/prCopy.h>
    32 #include <kernel/longrat.h>
     32#include <libpolys/coeffs/longrat.h>
    3333#include <coeffs/modulop.h>
    3434#define BUCKETS_FOR_NORO_RED 1

  • kernel/tmult.cc

    r5179a0 ra44806  
    1212#include <kernel/numbers.h>
    1313#include <kernel/polys.h>
    14 #include <kernel/longrat.h>
     14#include <libpolys/coeffs/longrat.h>
    1515#ifdef SI_THREADS
    1616#include <pthread.h>
Note: See TracChangeset for help on using the changeset viewer.