Changeset 24cece in git

Timestamp:

Apr 14, 2010, 3:30:27 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

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:

• modulop.cc (modified) (2 diffs)
• p_polys.cc (modified) (1 diff)
• ring.cc (modified) (1 diff)
• ring.h (modified) (16 diffs)
• sbuckets.cc (modified) (1 diff)
• tgb.cc (modified) (3 diffs)

kernel/modulop.cc

@@ -149 +149 @@
 #endif
 
-inline number npInversM (number c)
+static inline number npInversM (number c)
 {
 #ifndef HAVE_DIV_MOD
@@ -606 +606 @@
 }
 
-inline number nvInversM (number c)
+static inline number nvInversM (number c)
 {
   long inv=nvInvMod((long)c);

kernel/p_polys.cc

@@ -414 +414 @@
 // pWTotalDegree for weighted orderings
 // whose first block covers all variables
-inline long _pWFirstTotalDegree(poly p, const ring r)
+static inline long _pWFirstTotalDegree(poly p, const ring r)
 {
   int i;

kernel/ring.cc

@@ -4143 +4143 @@
 
 /// debug-print monomial poly/vector p, assuming that it lives in the ring R
-inline void m_DebugPrint(const poly p, const ring R)
+static inline void m_DebugPrint(const poly p, const ring R)
 {
   Print("\nexp[0..%d]\n", R->ExpL_Size - 1);

kernel/ring.h

@@ -76 +76 @@
 
 /// we must always have this test!
-inline bool rIsPluralRing(const ring r)
+static inline bool rIsPluralRing(const ring r)
 {
 #ifdef HAVE_PLURAL
@@ -86 +86 @@
 }
 
-inline bool rIsRatGRing(const ring r)
+static inline bool rIsRatGRing(const ring r)
 {
 #ifdef HAVE_PLURAL
@@ -146 +146 @@
 
 #ifdef HAVE_RINGS
-inline BOOLEAN rField_is_Ring_2toM(ring r=currRing)
+static inline BOOLEAN rField_is_Ring_2toM(ring r=currRing)
 { return (r->ringtype == 1); }
 
-inline BOOLEAN rField_is_Ring_ModN(ring r=currRing)
+static inline BOOLEAN rField_is_Ring_ModN(ring r=currRing)
 { return (r->ringtype == 2); }
 
-inline BOOLEAN rField_is_Ring_PtoM(ring r=currRing)
+static inline BOOLEAN rField_is_Ring_PtoM(ring r=currRing)
 { return (r->ringtype == 3); }
 
-inline BOOLEAN rField_is_Ring_Z(ring r=currRing)
+static inline BOOLEAN rField_is_Ring_Z(ring r=currRing)
 { return (r->ringtype == 4); }
 
-inline BOOLEAN rField_is_Ring(ring r=currRing)
+static inline BOOLEAN rField_is_Ring(ring r=currRing)
 { return (r->ringtype != 0); }
 
-inline BOOLEAN rField_is_Domain(ring r=currRing)
+static inline BOOLEAN rField_is_Domain(ring r=currRing)
 { return (r->ringtype == 4 || r->ringtype == 0); }
 
-inline BOOLEAN rField_has_Units(ring r=currRing)
+static inline BOOLEAN rField_has_Units(ring r=currRing)
 { return ((r->ringtype == 1) || (r->ringtype == 2) || (r->ringtype == 3)); }
 #else
@@ -171 +171 @@
 
 #ifdef HAVE_RINGS
-inline BOOLEAN rField_is_Zp(ring r=currRing)
+static inline BOOLEAN rField_is_Zp(ring r=currRing)
 { return (r->ringtype == 0) && (r->ch > 1) && (r->parameter==NULL); }
 
-inline BOOLEAN rField_is_Zp(ring r, int p)
+static inline BOOLEAN rField_is_Zp(ring r, int p)
 { return (r->ringtype == 0) && (r->ch > 1 && r->ch == ABS(p) && r->parameter==NULL); }
 
-inline BOOLEAN rField_is_Q(ring r=currRing)
+static inline BOOLEAN rField_is_Q(ring r=currRing)
 { return (r->ringtype == 0) && (r->ch == 0) && (r->parameter==NULL); }
 
-inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
+static inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
 { return (r->ringtype == 0) && (r->ch ==  -1); }
 
-inline BOOLEAN rField_is_R(ring r=currRing)
+static inline BOOLEAN rField_is_R(ring r=currRing)
 {
   if (rField_is_numeric(r) && (r->float_len <= (short)SHORT_REAL_LENGTH))
@@ -190 +190 @@
 }
 
-inline BOOLEAN rField_is_GF(ring r=currRing)
+static inline BOOLEAN rField_is_GF(ring r=currRing)
 { return (r->ringtype == 0) && (r->ch > 1) && (r->parameter!=NULL); }
 
-inline BOOLEAN rField_is_GF(ring r, int q)
+static inline BOOLEAN rField_is_GF(ring r, int q)
 { return (r->ringtype == 0) && (r->ch == q); }
 
-inline BOOLEAN rField_is_Zp_a(ring r=currRing)
+static inline BOOLEAN rField_is_Zp_a(ring r=currRing)
 { return (r->ringtype == 0) && (r->ch < -1); }
 
-inline BOOLEAN rField_is_Zp_a(ring r, int p)
+static inline BOOLEAN rField_is_Zp_a(ring r, int p)
 { return (r->ringtype == 0) && (r->ch < -1 ) && (-(r->ch) == ABS(p)); }
 
-inline BOOLEAN rField_is_Q_a(ring r=currRing)
+static inline BOOLEAN rField_is_Q_a(ring r=currRing)
 { return (r->ringtype == 0) && (r->ch == 1); }
 
-inline BOOLEAN rField_is_long_R(ring r=currRing)
+static inline BOOLEAN rField_is_long_R(ring r=currRing)
 {
   if (rField_is_numeric(r) && (r->float_len >(short)SHORT_REAL_LENGTH))
@@ -212 +212 @@
 }
 
-inline BOOLEAN rField_is_long_C(ring r=currRing)
+static inline BOOLEAN rField_is_long_C(ring r=currRing)
 {
   if (rField_is_numeric(r))
@@ -219 +219 @@
 }
 #else
-inline BOOLEAN rField_is_Zp(ring r=currRing)
+static inline BOOLEAN rField_is_Zp(ring r=currRing)
 { return (r->ch > 1) && (r->parameter==NULL); }
 
-inline BOOLEAN rField_is_Zp(ring r, int p)
+static inline BOOLEAN rField_is_Zp(ring r, int p)
 { return (r->ch > 1 && r->ch == ABS(p) && r->parameter==NULL); }
 
-inline BOOLEAN rField_is_Q(ring r=currRing)
+static inline BOOLEAN rField_is_Q(ring r=currRing)
 { return (r->ch == 0) && (r->parameter==NULL); }
 
-inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
+static inline BOOLEAN rField_is_numeric(ring r=currRing) /* R, long R, long C */
 { return (r->ch ==  -1); }
 
-inline BOOLEAN rField_is_R(ring r=currRing)
+static inline BOOLEAN rField_is_R(ring r=currRing)
 {
   if (rField_is_numeric(r) && (r->float_len <= (short)SHORT_REAL_LENGTH))
@@ -238 +238 @@
 }
 
-inline BOOLEAN rField_is_GF(ring r=currRing)
+static inline BOOLEAN rField_is_GF(ring r=currRing)
 { return (r->ch > 1) && (r->parameter!=NULL); }
 
-inline BOOLEAN rField_is_GF(ring r, int q)
+static inline BOOLEAN rField_is_GF(ring r, int q)
 { return (r->ch == q); }
 
-inline BOOLEAN rField_is_Zp_a(ring r=currRing)
+static inline BOOLEAN rField_is_Zp_a(ring r=currRing)
 { return (r->ch < -1); }
 
-inline BOOLEAN rField_is_Zp_a(ring r, int p)
+static inline BOOLEAN rField_is_Zp_a(ring r, int p)
 { return (r->ch < -1 ) && (-(r->ch) == ABS(p)); }
 
-inline BOOLEAN rField_is_Q_a(ring r=currRing)
+static inline BOOLEAN rField_is_Q_a(ring r=currRing)
 { return (r->ch == 1); }
 
-inline BOOLEAN rField_is_long_R(ring r=currRing)
+static inline BOOLEAN rField_is_long_R(ring r=currRing)
 {
   if (rField_is_numeric(r) && (r->float_len >(short)SHORT_REAL_LENGTH))
@@ -260 +260 @@
 }
 
-inline BOOLEAN rField_is_long_C(ring r=currRing)
+static inline BOOLEAN rField_is_long_C(ring r=currRing)
 {
   if (rField_is_numeric(r))
@@ -268 +268 @@
 #endif
 
-inline BOOLEAN rField_has_simple_inverse(ring r=currRing)
+static inline BOOLEAN rField_has_simple_inverse(ring r=currRing)
 /* { return (r->ch>1) || (r->ch== -1); } *//* Z/p, GF(p,n), R, long_R, long_C*/
 #ifdef HAVE_RINGS
@@ -276 +276 @@
 #endif
 
-inline BOOLEAN rField_has_simple_Alloc(ring r=currRing)
+static inline BOOLEAN rField_has_simple_Alloc(ring r=currRing)
 { return (rField_is_Zp(r)
        || rField_is_GF(r)
@@ -285 +285 @@
 
 /* Z/p, GF(p,n), R: nCopy, nNew, nDelete are dummies*/
-inline BOOLEAN rField_is_Extension(ring r=currRing)
+static inline BOOLEAN rField_is_Extension(ring r=currRing)
 { return (rField_is_Q_a(r)) || (rField_is_Zp_a(r)); } /* Z/p(a) and Q(a)*/
 
@@ -297 +297 @@
 // use this to free fields created by rComplete //?
 
-inline int rBlocks(ring r)
+static inline int rBlocks(ring r)
 {
   int i=0;
@@ -305 +305 @@
 
 // misc things
-inline char* rRingVar(short i)
+static inline char* rRingVar(short i)
 {
   return currRing->names[i];
 }
-inline char* rRingVar(short i, ring r)
+static inline char* rRingVar(short i, ring r)
 {
   return r->names[i];
 }
-inline BOOLEAN rShortOut(ring r)
+static inline BOOLEAN rShortOut(ring r)
 {
   return (r->ShortOut);
@@ -363 +363 @@
 } rOrderType_t;
 
-inline BOOLEAN rIsSyzIndexRing(const ring r)
+static inline BOOLEAN rIsSyzIndexRing(const ring r)
 { return r->order[0] == ringorder_s;}
 
-inline int rGetCurrSyzLimit(const ring r = currRing)
+static inline int rGetCurrSyzLimit(const ring r = currRing)
 { return (rIsSyzIndexRing(r)? r->typ[0].data.syz.limit : 0);}
 
@@ -411 +411 @@
 BOOLEAN rIsPolyVar(int i, ring r = currRing);
 
-inline BOOLEAN rOrd_is_Comp_dp(ring r)
+static inline BOOLEAN rOrd_is_Comp_dp(ring r)
 {
   return ((r->order[0] == ringorder_c || r->order[0] == ringorder_C) &&

kernel/sbuckets.cc

@@ -76 +76 @@
 //
 // returns floor(log_2(i))
-inline int LOG2(int i)
+static inline int LOG2(int i)
 {
   assume (i > 0);

kernel/tgb.cc

@@ -130 +130 @@
 #ifdef LEN_VAR1
 // erste Variante: Laenge: Anzahl der Monome
-inline int pSLength(poly p, int l) {
-  return l; }
-inline int kSBucketLength(kBucket* bucket, poly lm) {return bucket_guess(bucket);}
+static inline int pSLength(poly p, int l) { return l; }
+static inline int kSBucketLength(kBucket* bucket, poly lm)
+  {return bucket_guess(bucket);}
 #endif
 
@@ -182 +182 @@
 
 #ifdef LEN_VAR3
-inline wlen_type pSLength(poly p,int l)
+static inline wlen_type pSLength(poly p,int l)
 {
   wlen_type c;
@@ -249 +249 @@
 #endif
 #ifdef LEN_VAR5
-inline wlen_type pSLength(poly p,int l)
+static inline wlen_type pSLength(poly p,int l)
 {
   int c;