Changeset 24cece in git


Ignore:
Timestamp:
Apr 14, 2010, 3:30:27 PM (14 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
40ef69eb0356769b3a3348ce89e3d83e8a3dc731
Parents:
835793055d9c6a6ad786cbcc0c96dbf391395716
Message:
static inline

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

Legend:

Unmodified
Added
Removed
  • kernel/modulop.cc

    r8357930 r24cece  
    149149#endif
    150150
    151 inline number npInversM (number c)
     151static inline number npInversM (number c)
    152152{
    153153#ifndef HAVE_DIV_MOD
     
    606606}
    607607
    608 inline number nvInversM (number c)
     608static inline number nvInversM (number c)
    609609{
    610610  long inv=nvInvMod((long)c);
  • kernel/p_polys.cc

    r8357930 r24cece  
    414414// pWTotalDegree for weighted orderings
    415415// whose first block covers all variables
    416 inline long _pWFirstTotalDegree(poly p, const ring r)
     416static inline long _pWFirstTotalDegree(poly p, const ring r)
    417417{
    418418  int i;
  • kernel/ring.cc

    r8357930 r24cece  
    41434143
    41444144/// debug-print monomial poly/vector p, assuming that it lives in the ring R
    4145 inline void m_DebugPrint(const poly p, const ring R)
     4145static inline void m_DebugPrint(const poly p, const ring R)
    41464146{
    41474147  Print("\nexp[0..%d]\n", R->ExpL_Size - 1);
  • kernel/ring.h

    r8357930 r24cece  
    7676
    7777/// we must always have this test!
    78 inline bool rIsPluralRing(const ring r)
     78static inline bool rIsPluralRing(const ring r)
    7979{
    8080#ifdef HAVE_PLURAL
     
    8686}
    8787
    88 inline bool rIsRatGRing(const ring r)
     88static inline bool rIsRatGRing(const ring r)
    8989{
    9090#ifdef HAVE_PLURAL
     
    146146
    147147#ifdef HAVE_RINGS
    148 inline BOOLEAN rField_is_Ring_2toM(ring r=currRing)
     148static inline BOOLEAN rField_is_Ring_2toM(ring r=currRing)
    149149{ return (r->ringtype == 1); }
    150150
    151 inline BOOLEAN rField_is_Ring_ModN(ring r=currRing)
     151static inline BOOLEAN rField_is_Ring_ModN(ring r=currRing)
    152152{ return (r->ringtype == 2); }
    153153
    154 inline BOOLEAN rField_is_Ring_PtoM(ring r=currRing)
     154static inline BOOLEAN rField_is_Ring_PtoM(ring r=currRing)
    155155{ return (r->ringtype == 3); }
    156156
    157 inline BOOLEAN rField_is_Ring_Z(ring r=currRing)
     157static inline BOOLEAN rField_is_Ring_Z(ring r=currRing)
    158158{ return (r->ringtype == 4); }
    159159
    160 inline BOOLEAN rField_is_Ring(ring r=currRing)
     160static inline BOOLEAN rField_is_Ring(ring r=currRing)
    161161{ return (r->ringtype != 0); }
    162162
    163 inline BOOLEAN rField_is_Domain(ring r=currRing)
     163static inline BOOLEAN rField_is_Domain(ring r=currRing)
    164164{ return (r->ringtype == 4 || r->ringtype == 0); }
    165165
    166 inline BOOLEAN rField_has_Units(ring r=currRing)
     166static inline BOOLEAN rField_has_Units(ring r=currRing)
    167167{ return ((r->ringtype == 1) || (r->ringtype == 2) || (r->ringtype == 3)); }
    168168#else
     
    171171
    172172#ifdef HAVE_RINGS
    173 inline BOOLEAN rField_is_Zp(ring r=currRing)
     173static inline BOOLEAN rField_is_Zp(ring r=currRing)
    174174{ return (r->ringtype == 0) && (r->ch > 1) && (r->parameter==NULL); }
    175175
    176 inline BOOLEAN rField_is_Zp(ring r, int p)
     176static inline BOOLEAN rField_is_Zp(ring r, int p)
    177177{ return (r->ringtype == 0) && (r->ch > 1 && r->ch == ABS(p) && r->parameter==NULL); }
    178178
    179 inline BOOLEAN rField_is_Q(ring r=currRing)
     179static inline BOOLEAN rField_is_Q(ring r=currRing)
    180180{ return (r->ringtype == 0) && (r->ch == 0) && (r->parameter==NULL); }
    181181
    182 inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
     182static inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
    183183{ return (r->ringtype == 0) && (r->ch ==  -1); }
    184184
    185 inline BOOLEAN rField_is_R(ring r=currRing)
     185static inline BOOLEAN rField_is_R(ring r=currRing)
    186186{
    187187  if (rField_is_numeric(r) && (r->float_len <= (short)SHORT_REAL_LENGTH))
     
    190190}
    191191
    192 inline BOOLEAN rField_is_GF(ring r=currRing)
     192static inline BOOLEAN rField_is_GF(ring r=currRing)
    193193{ return (r->ringtype == 0) && (r->ch > 1) && (r->parameter!=NULL); }
    194194
    195 inline BOOLEAN rField_is_GF(ring r, int q)
     195static inline BOOLEAN rField_is_GF(ring r, int q)
    196196{ return (r->ringtype == 0) && (r->ch == q); }
    197197
    198 inline BOOLEAN rField_is_Zp_a(ring r=currRing)
     198static inline BOOLEAN rField_is_Zp_a(ring r=currRing)
    199199{ return (r->ringtype == 0) && (r->ch < -1); }
    200200
    201 inline BOOLEAN rField_is_Zp_a(ring r, int p)
     201static inline BOOLEAN rField_is_Zp_a(ring r, int p)
    202202{ return (r->ringtype == 0) && (r->ch < -1 ) && (-(r->ch) == ABS(p)); }
    203203
    204 inline BOOLEAN rField_is_Q_a(ring r=currRing)
     204static inline BOOLEAN rField_is_Q_a(ring r=currRing)
    205205{ return (r->ringtype == 0) && (r->ch == 1); }
    206206
    207 inline BOOLEAN rField_is_long_R(ring r=currRing)
     207static inline BOOLEAN rField_is_long_R(ring r=currRing)
    208208{
    209209  if (rField_is_numeric(r) && (r->float_len >(short)SHORT_REAL_LENGTH))
     
    212212}
    213213
    214 inline BOOLEAN rField_is_long_C(ring r=currRing)
     214static inline BOOLEAN rField_is_long_C(ring r=currRing)
    215215{
    216216  if (rField_is_numeric(r))
     
    219219}
    220220#else
    221 inline BOOLEAN rField_is_Zp(ring r=currRing)
     221static inline BOOLEAN rField_is_Zp(ring r=currRing)
    222222{ return (r->ch > 1) && (r->parameter==NULL); }
    223223
    224 inline BOOLEAN rField_is_Zp(ring r, int p)
     224static inline BOOLEAN rField_is_Zp(ring r, int p)
    225225{ return (r->ch > 1 && r->ch == ABS(p) && r->parameter==NULL); }
    226226
    227 inline BOOLEAN rField_is_Q(ring r=currRing)
     227static inline BOOLEAN rField_is_Q(ring r=currRing)
    228228{ return (r->ch == 0) && (r->parameter==NULL); }
    229229
    230 inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
     230static inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
    231231{ return (r->ch ==  -1); }
    232232
    233 inline BOOLEAN rField_is_R(ring r=currRing)
     233static inline BOOLEAN rField_is_R(ring r=currRing)
    234234{
    235235  if (rField_is_numeric(r) && (r->float_len <= (short)SHORT_REAL_LENGTH))
     
    238238}
    239239
    240 inline BOOLEAN rField_is_GF(ring r=currRing)
     240static inline BOOLEAN rField_is_GF(ring r=currRing)
    241241{ return (r->ch > 1) && (r->parameter!=NULL); }
    242242
    243 inline BOOLEAN rField_is_GF(ring r, int q)
     243static inline BOOLEAN rField_is_GF(ring r, int q)
    244244{ return (r->ch == q); }
    245245
    246 inline BOOLEAN rField_is_Zp_a(ring r=currRing)
     246static inline BOOLEAN rField_is_Zp_a(ring r=currRing)
    247247{ return (r->ch < -1); }
    248248
    249 inline BOOLEAN rField_is_Zp_a(ring r, int p)
     249static inline BOOLEAN rField_is_Zp_a(ring r, int p)
    250250{ return (r->ch < -1 ) && (-(r->ch) == ABS(p)); }
    251251
    252 inline BOOLEAN rField_is_Q_a(ring r=currRing)
     252static inline BOOLEAN rField_is_Q_a(ring r=currRing)
    253253{ return (r->ch == 1); }
    254254
    255 inline BOOLEAN rField_is_long_R(ring r=currRing)
     255static inline BOOLEAN rField_is_long_R(ring r=currRing)
    256256{
    257257  if (rField_is_numeric(r) && (r->float_len >(short)SHORT_REAL_LENGTH))
     
    260260}
    261261
    262 inline BOOLEAN rField_is_long_C(ring r=currRing)
     262static inline BOOLEAN rField_is_long_C(ring r=currRing)
    263263{
    264264  if (rField_is_numeric(r))
     
    268268#endif
    269269
    270 inline BOOLEAN rField_has_simple_inverse(ring r=currRing)
     270static inline BOOLEAN rField_has_simple_inverse(ring r=currRing)
    271271/* { return (r->ch>1) || (r->ch== -1); } *//* Z/p, GF(p,n), R, long_R, long_C*/
    272272#ifdef HAVE_RINGS
     
    276276#endif
    277277
    278 inline BOOLEAN rField_has_simple_Alloc(ring r=currRing)
     278static inline BOOLEAN rField_has_simple_Alloc(ring r=currRing)
    279279{ return (rField_is_Zp(r)
    280280       || rField_is_GF(r)
     
    285285
    286286/* Z/p, GF(p,n), R: nCopy, nNew, nDelete are dummies*/
    287 inline BOOLEAN rField_is_Extension(ring r=currRing)
     287static inline BOOLEAN rField_is_Extension(ring r=currRing)
    288288{ return (rField_is_Q_a(r)) || (rField_is_Zp_a(r)); } /* Z/p(a) and Q(a)*/
    289289
     
    297297// use this to free fields created by rComplete //?
    298298
    299 inline int rBlocks(ring r)
     299static inline int rBlocks(ring r)
    300300{
    301301  int i=0;
     
    305305
    306306// misc things
    307 inline char* rRingVar(short i)
     307static inline char* rRingVar(short i)
    308308{
    309309  return currRing->names[i];
    310310}
    311 inline char* rRingVar(short i, ring r)
     311static inline char* rRingVar(short i, ring r)
    312312{
    313313  return r->names[i];
    314314}
    315 inline BOOLEAN rShortOut(ring r)
     315static inline BOOLEAN rShortOut(ring r)
    316316{
    317317  return (r->ShortOut);
     
    363363} rOrderType_t;
    364364
    365 inline BOOLEAN rIsSyzIndexRing(const ring r)
     365static inline BOOLEAN rIsSyzIndexRing(const ring r)
    366366{ return r->order[0] == ringorder_s;}
    367367
    368 inline int rGetCurrSyzLimit(const ring r = currRing)
     368static inline int rGetCurrSyzLimit(const ring r = currRing)
    369369{ return (rIsSyzIndexRing(r)? r->typ[0].data.syz.limit : 0);}
    370370
     
    411411BOOLEAN rIsPolyVar(int i, ring r = currRing);
    412412
    413 inline BOOLEAN rOrd_is_Comp_dp(ring r)
     413static inline BOOLEAN rOrd_is_Comp_dp(ring r)
    414414{
    415415  return ((r->order[0] == ringorder_c || r->order[0] == ringorder_C) &&
  • kernel/sbuckets.cc

    r8357930 r24cece  
    7676//
    7777// returns floor(log_2(i))
    78 inline int LOG2(int i)
     78static inline int LOG2(int i)
    7979{
    8080  assume (i > 0);
  • kernel/tgb.cc

    r8357930 r24cece  
    130130#ifdef LEN_VAR1
    131131// erste Variante: Laenge: Anzahl der Monome
    132 inline int pSLength(poly p, int l) {
    133   return l; }
    134 inline int kSBucketLength(kBucket* bucket, poly lm) {return bucket_guess(bucket);}
     132static inline int pSLength(poly p, int l) { return l; }
     133static inline int kSBucketLength(kBucket* bucket, poly lm)
     134  {return bucket_guess(bucket);}
    135135#endif
    136136
     
    182182
    183183#ifdef LEN_VAR3
    184 inline wlen_type pSLength(poly p,int l)
     184static inline wlen_type pSLength(poly p,int l)
    185185{
    186186  wlen_type c;
     
    249249#endif
    250250#ifdef LEN_VAR5
    251 inline wlen_type pSLength(poly p,int l)
     251static inline wlen_type pSLength(poly p,int l)
    252252{
    253253  int c;
Note: See TracChangeset for help on using the changeset viewer.