Changeset 9cb305 in git

Timestamp:

Jul 29, 2013, 5:20:20 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

ddf322c56f685741b1af472fa594094a49f8c6ad

Parents:

3631a1348b10ecae02a13616277e1ba0458f46e7

Message:

fix: compiler warnings

Location:

Singular

Files:

• extra.cc (modified) (1 diff)
• ipshell.cc (modified) (9 diffs)

Singular/extra.cc

@@ -3265 +3265 @@
         ideal GI = (ideal) h->Data();
         res->rtyp = INT_CMD;
-        res->data = (void *) testGB(I, GI);
+        res->data = (void *)(long) testGB(I, GI);
         return(FALSE);
       }

Singular/ipshell.cc

@@ -2171 +2171 @@
         ch = l;
       }
-      R->cf = nInitChar(n_Zp, (void*)ch);
+      R->cf = nInitChar(n_Zp, (void*)(long)ch);
     }
   }
@@ -2729 +2729 @@
   //row_shift += add_row_shift;
   //Print("row_shift=%d, add_row_shift=%d\n",row_shift,add_row_shift);
-  atSet(res,omStrDup("rowShift"),(void*)add_row_shift,INT_CMD);
+  atSet(res,omStrDup("rowShift"),(void*)(long)add_row_shift,INT_CMD);
 
   return FALSE;
@@ -2996 +2996 @@
     L->m[5].rtyp = INTVEC_CMD; //  multiplicities
 
-    L->m[0].data = (void*)spec.mu;
-    L->m[1].data = (void*)spec.pg;
-    L->m[2].data = (void*)spec.n;
+    L->m[0].data = (void*)(long)spec.mu;
+    L->m[1].data = (void*)(long)spec.pg;
+    L->m[2].data = (void*)(long)spec.n;
     L->m[3].data = (void*)num;
     L->m[4].data = (void*)den;
@@ -3359 +3359 @@
       (*L)->Init( 1 );
       (*L)->m[0].rtyp = INT_CMD;    //  milnor number
-      (*L)->m[0].data = (void*)mu;
+      (*L)->m[0].data = (void*)(long)mu;
 
       return spectrumDegenerate;
@@ -3376 +3376 @@
   (*L)->m[5].rtyp = INTVEC_CMD; //  multiplicities
 
-  (*L)->m[0].data = (void*)mu;
-  (*L)->m[1].data = (void*)pg;
-  (*L)->m[2].data = (void*)n;
+  (*L)->m[0].data = (void*)(long)mu;
+  (*L)->m[1].data = (void*)(long)pg;
+  (*L)->m[2].data = (void*)(long)n;
   (*L)->m[3].data = (void*)nom;
   (*L)->m[4].data = (void*)den;
@@ -4116 +4116 @@
     res->rtyp = INT_CMD;
     if (qh)
-      res->data = (void*)(s1.mult_spectrumh( s2 ));
+      res->data = (void*)(long)(s1.mult_spectrumh( s2 ));
     else
-      res->data = (void*)(s1.mult_spectrum( s2 ));
+      res->data = (void*)(long)(s1.mult_spectrum( s2 ));
   }
 
@@ -4215 +4215 @@
 
   lres->m[1].rtyp= INT_CMD;   // found a solution?
-  lres->m[1].data=(void*)LP->icase;
+  lres->m[1].data=(void*)(long)LP->icase;
 
   lres->m[2].rtyp= INTVEC_CMD;
@@ -4224 +4224 @@
 
   lres->m[4].rtyp= INT_CMD;
-  lres->m[4].data=(void*)LP->m;
+  lres->m[4].data=(void*)(long)LP->m;
 
   lres->m[5].rtyp= INT_CMD;
-  lres->m[5].data=(void*)LP->n;
+  lres->m[5].data=(void*)(long)LP->n;
 
   res->data= (void*)lres;
@@ -5761 +5761 @@
     memset(&tmp_in,0,sizeof(tmp_in));
     tmp_in.rtyp=INT_CMD;
-    tmp_in.data=(void*)(*aa)[i];
+    tmp_in.data=(void*)(long)(*aa)[i];
     if (proc==NULL)
       bo=iiExprArith1(&tmp_out,&tmp_in,op);