Changeset 6c98d52 in git

Timestamp:

Jan 11, 2012, 3:13:15 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

2dbf7e59673f79e50959ef8e51ebc47ff01dcb9651c97ff9c3e771c56591bbd2c4d517a85fd8ab21a88d77fb7c121ed4c21583c156ff79873682c839

Parents:

930ea815182bc9bf3182f1c57876006af26295b2

Message:

chg: compiler warnings in kutil.cc

Files:

• kernel/kutil.cc (modified) (23 diffs)
• libpolys/polys/monomials/p_polys.h (modified) (1 diff)

kernel/kutil.cc

@@ -1006 +1006 @@
 void enterL (LSet *set,int *length, int *LSetmax, LObject p,int at)
 {
-#ifdef PDEBUG
-  /*  zaehler++; */
-#endif /*PDEBUG*/
-  int i;
   // this should be corrected
   assume(p.FDeg == p.pFDeg());
@@ -1047 +1043 @@
 }
 
-void initEcartPairBba (LObject* Lp,poly f,poly g,int ecartF,int ecartG)
+void initEcartPairBba (LObject* Lp,poly /*f*/,poly /*g*/,int /*ecartF*/,int /*ecartG*/)
 {
   Lp->FDeg = Lp->pFDeg();
@@ -1054 +1050 @@
 }
 
-void initEcartPairMora (LObject* Lp,poly f,poly g,int ecartF,int ecartG)
+void initEcartPairMora (LObject* Lp,poly /*f*/,poly /*g*/,int ecartF,int ecartG)
 {
   Lp->FDeg = Lp->pFDeg();
@@ -1295 +1291 @@
 */
 
-BOOLEAN enterOneStrongPoly (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
+BOOLEAN enterOneStrongPoly (int i,poly p,int /*ecart*/, int /*isFromQ*/,kStrategy strat, int atR = -1)
 {
   number d, s, t;
@@ -2350 +2346 @@
 *using the chain-criterion in B and L and enters B to L
 */
-void chainCritRing (poly p,int ecart,kStrategy strat)
+void chainCritRing (poly p,int, kStrategy strat)
 {
   int i,j,l;
@@ -2918 +2914 @@
 void initenterstrongPairs (poly h,int k,int ecart,int isFromQ,kStrategy strat, int atR = -1)
 {
-  const int iCompH = pGetComp(h);
+  const unsigned long iCompH = pGetComp(h);
   if (!nIsOne(pGetCoeff(h)))
   {
@@ -3228 +3224 @@
   int en = length;
   int cmp_int = currRing->OrdSgn;
-  int pc=pGetComp(p);
   if ((currRing->MixedOrder)
 #ifdef HAVE_PLURAL
@@ -3325 +3320 @@
 * the position is the last one
 */
-int posInT0 (const TSet set,const int length,LObject &p)
+int posInT0 (const TSet,const int length,LObject &)
 {
   return (length+1);
@@ -3770 +3765 @@
   /* cc==1 for (c,..), cc==-1 for (C,..) */
   int o = p.GetpFDeg() + p.ecart;
-  int c = pGetComp(p.p)*cc;
+  unsigned long c = pGetComp(p.p)*cc;
 
   if (pGetComp(set[length].p)*cc < c)
@@ -3886 +3881 @@
 */
 int posInLSpecial (const LSet set, const int length,
-                   LObject *p,const kStrategy strat)
+                   LObject *p,const kStrategy)
 {
   if (length<0) return 0;
@@ -3929 +3924 @@
 */
 int posInL0 (const LSet set, const int length,
-             LObject* p,const kStrategy strat)
+             LObject* p,const kStrategy)
 {
   if (length<0) return 0;
@@ -3960 +3955 @@
 */
 int posInL11 (const LSet set, const int length,
-              LObject* p,const kStrategy strat)
+              LObject* p,const kStrategy)
 /*{
  * int j=0;
@@ -4030 +4025 @@
 
 int posInLrg0 (const LSet set, const int length,
-              LObject* p,const kStrategy strat)
+              LObject* p,const kStrategy)
 /*          if (nGreater(pGetCoeff(p), pGetCoeff(set[an]))) return en;
         if (pLmCmp(set[i],p) == cmp_int)         en = i;
@@ -4114 +4109 @@
 */
 int posInL110 (const LSet set, const int length,
-               LObject* p,const kStrategy strat)
+               LObject* p,const kStrategy)
 {
   if (length<0) return 0;
@@ -4160 +4155 @@
 */
 int posInL13 (const LSet set, const int length,
-              LObject* p,const kStrategy strat)
+              LObject* p,const kStrategy)
 {
   if (length<0) return 0;
@@ -4195 +4190 @@
 */
 int posInL15 (const LSet set, const int length,
-              LObject* p,const kStrategy strat)
+              LObject* p,const kStrategy)
 /*{
  * int j=0;
@@ -4253 +4248 @@
 */
 int posInL17 (const LSet set, const int length,
-              LObject* p,const kStrategy strat)
+              LObject* p,const kStrategy)
 {
   if (length<0) return 0;
@@ -4301 +4296 @@
 */
 int posInL17_c (const LSet set, const int length,
-                LObject* p,const kStrategy strat)
+                LObject* p,const kStrategy)
 {
   if (length<0) return 0;
@@ -4307 +4302 @@
   int cc = (-1+2*currRing->order[0]==ringorder_c);
   /* cc==1 for (c,..), cc==-1 for (C,..) */
-  int c = pGetComp(p->p)*cc;
+  unsigned long c = pGetComp(p->p)*cc;
   int o = p->GetpFDeg() + p->ecart;
 
@@ -4442 +4437 @@
 {
   poly h, hn;
-  int j;
-  unsigned long not_sev;
   strat->redTailChange=FALSE;
 
@@ -4562 +4555 @@
       {
         cnt=REDTAIL_CANONICALIZE;
-        poly tmp=Ln.CanonicalizeP();
+        /*poly tmp=*/Ln.CanonicalizeP();
         if (normalize)
         {
@@ -4650 +4643 @@
       {
         cnt=REDTAIL_CANONICALIZE;
-        poly tmp=Ln.CanonicalizeP();
-      }
-      // we are in Z, do not Ccall pNorm
+        /*poly tmp=*/Ln.CanonicalizeP();
+      }
+      // we are in Z, do not call pNorm
       strat->redTailChange=TRUE;
       // test divisibility of coefs:
@@ -5573 +5566 @@
 void enterSBba (LObject p,int atS,kStrategy strat, int atR)
 {
-  int i;
   strat->news = TRUE;
   /*- puts p to the standardbasis s at position at -*/

libpolys/polys/monomials/p_polys.h

@@ -55 +55 @@
 }
 
-// #define p_GetCoeff(p,r)     pGetCoeff(p)
-static inline number& p_GetCoeff(poly p, const ring r)
-{
-  assume(r != NULL);
-  return pGetCoeff(p);
-}
+#define p_GetCoeff(p,r)     pGetCoeff(p)
+//static inline number& p_GetCoeff(poly p, const ring r)
+//{
+//  assume(r != NULL);
+//  return pGetCoeff(p);
+//}