Changeset f224d85 in git for kernel/kInline.h

Timestamp:

Sep 24, 2012, 2:52:20 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

92296297754bdb3c65ffad980c8e982ef37cf33b

Parents:

abe5c8b5ebdd2be025cd137e4a089c3780efb8a3

Message:

fix: removing last from p_*templates and k* routines

File:

• kernel/kInline.h (modified) (7 diffs)

kernel/kInline.h

@@ -546 +546 @@
       if (p != NULL) pNext(p) = NULL;
       pLength = 0;
-      last = NULL;
-    }
-  }
-}
-
-KINLINE void sLObject::SetLmTail(poly lm, poly p_tail, int p_Length, int use_bucket, ring _tailRing, poly _last)
+    }
+  }
+}
+
+KINLINE void sLObject::SetLmTail(poly lm, poly p_tail, int p_Length, int use_bucket, ring _tailRing)
 {
 
@@ -561 +560 @@
     pNext(lm) = NULL;
     pLength = 0;
-    last = NULL;
   }
   else
@@ -567 +565 @@
     pNext(lm) = p_tail;
     pLength = p_Length + 1;
-    last = _last;
-  }
-
+  }
 }
 
@@ -718 +714 @@
                               new_tailRing->PolyBin,p_shallow_copy_delete,
                               FALSE);
-  last = NULL;
 }
 
@@ -747 +742 @@
   }
   TObject::Copy();
-  last = NULL;
 }
 
 KINLINE poly sLObject::CopyGetP()
 {
-  last = NULL;
   if (bucket != NULL)
   {
@@ -789 +782 @@
   if (! deg_last || bucket != NULL) return sLObject::pLDeg();
 
-  if (last == NULL || pLength == 0)
-    last = pLast(GetLmTailRing(), pLength);
-#ifdef HAVE_ASSUME
   long ldeg;
   ldeg = tailRing->pLDeg(GetLmTailRing(), &length, tailRing);
+#ifdef HAVE_ASSUME
+  if ( pLength == 0)
+    p_Last(GetLmTailRing(), pLength, tailRing);
   assume ( pLength == length || rIsSyzIndexRing(currRing));
-  assume (ldeg == tailRing->pFDeg(last,tailRing));
+#else
+  pLength=length;
+#endif
   return ldeg;
-#else
-  length = pLength;
-  return tailRing->pFDeg(last, tailRing);
-#endif
 }
 
@@ -1173 +1164 @@
 // dummy function for function pointer strat->rewCrit being usable in all
 // possible choices for criteria
-KINLINE BOOLEAN arriRewDummy(poly sig, unsigned long not_sevSig, kStrategy strat, int start=0)
+KINLINE BOOLEAN arriRewDummy(poly /*sig*/, unsigned long /*not_sevSig*/, kStrategy /*strat*/, int start=0)
 {
   return FALSE;