Changeset 1327a0 in git

Timestamp:

Oct 19, 2011, 4:37:28 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

780e112edff75c0cf87a2cbc679791d1307e3f7e

Parents:

b093b052098cc93a629eb7fd0bad51349ec7ddaf

Message:

make g++ 4.6 happy

git-svn-id: file:///usr/local/Singular/svn/trunk@14419 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/tgb_internal.h (modified) (26 diffs)

kernel/tgb_internal.h

@@ -956 +956 @@
       int idx=idx_array[i];
       assume(bpos<256);
-      assume(!(npIsZero((number) buffer[bpos])));
-      temp_array[idx]=F4mat_to_number_type(npAddM((number) temp_array[idx], (number) buffer[bpos++]));
+      assume(!(npIsZero((number)(long) buffer[bpos])));
+      temp_array[idx]=F4mat_to_number_type(npAddM((number)(long) temp_array[idx], (number)(long) buffer[bpos++]));
       assume(idx<temp_size);
     }
@@ -998 +998 @@
       assume(bpos<256);
       //assume(!(npIsZero((number) buffer[bpos])));
-      temp_array[i]=F4mat_to_number_type(npAddM((number) temp_array[i], (number) buffer[bpos++]));
+      temp_array[i]=F4mat_to_number_type(npAddM((number)(long) temp_array[i], (number)(long) buffer[bpos++]));
       assume(i<temp_size);
     }
@@ -1038 +1038 @@
   {
 
-      temp_array[i]=F4mat_to_number_type(npSubM((number) temp_array[i], (number) row[i]));
+      temp_array[i]=F4mat_to_number_type(npSubM((number)(long) temp_array[i], (number)(long) row[i]));
       assume(i<temp_size);
   }
@@ -1054 +1054 @@
         {
           int idx=idx_array[j];
-          temp_array[idx]=F4mat_to_number_type(   (number_type)(long)npAddM((number) temp_array[idx],(number) coef_array[j]));
+          temp_array[idx]=F4mat_to_number_type(   (number_type)(long)npAddM((number) (long)temp_array[idx],(number)(long) coef_array[j]));
           assume(idx<temp_size);
         }
@@ -1068 +1068 @@
         {
           int idx=idx_array[j];
-          temp_array[idx]=F4mat_to_number_type(  (number_type)(long) npSubM((number) temp_array[idx],(number) coef_array[j]));
+          temp_array[idx]=F4mat_to_number_type(  (number_type)(long) npSubM((number) (long)temp_array[idx],(number)(long) coef_array[j]));
           assume(idx<temp_size);
         }
@@ -1093 +1093 @@
          if (row->idx_array)
          {
-           if (!((coef==(number) 1)||(coef==minus_one)))
+           if (!((coef==(number)(long) 1)||(coef==minus_one)))
            {
              add_coef_times_sparse(temp_array,temp_size,row,coef);
@@ -1099 +1099 @@
            else
            {
-             if (coef==(number) 1)
+             if (coef==(number)(long) 1)
              {
                add_sparse(temp_array,temp_size,row);
@@ -1111 +1111 @@
          else
          //TODO: treat, 1,-1
-         if (!((coef==(number) 1)||(coef==minus_one)))
+         if (!((coef==(number)(long) 1)||(coef==minus_one)))
          {
           add_coef_times_dense(temp_array,temp_size,row->coef_array,row->len,coef);
@@ -1117 +1117 @@
          else
          {
-           if (coef==(number)1)
+           if (coef==(number)(long)1)
              add_dense(temp_array,temp_size,row->coef_array,row->len);
            else
@@ -1131 +1131 @@
          if (red.ref->value_len==NoroCache<number_type>::backLinkCode)
          {
-           temp_array[red.ref->term_index]=F4mat_to_number_type( npAddM((number) temp_array[red.ref->term_index],red.coef));
+           temp_array[red.ref->term_index]=F4mat_to_number_type( npAddM((number)(long) temp_array[red.ref->term_index],red.coef));
          }
          else
@@ -1179 +1179 @@
     assume(coef_array[j]!=0);
     CoefIdx<number_type> ci;
-    ci.coef=F4mat_to_number_type(npMultM((number) coef,(number) coef_array[j]));
+    ci.coef=F4mat_to_number_type(npMultM((number)(long) coef,(number)(long) coef_array[j]));
     ci.idx=idx_array[j];
     pairs[pos++]=ci;
@@ -1194 +1194 @@
       assume(coef_array[j]!=0);
       CoefIdx<number_type> ci;
-      ci.coef=F4mat_to_number_type(npMultM((number) coef,(number) coef_array[j]));
+      ci.coef=F4mat_to_number_type(npMultM((number)(long) coef,(number)(long) coef_array[j]));
       assume(ci.coef!=0);
       ci.idx=j;
@@ -1229 +1229 @@
       assume(coef_array[j]!=0);
       CoefIdx<number_type> ci;
-      ci.coef=F4mat_to_number_type(npNegM((number) coef_array[j]));
+      ci.coef=F4mat_to_number_type(npNegM((number)(long) coef_array[j]));
       assume(ci.coef!=0);
       ci.idx=j;
@@ -1364 +1364 @@
     else
     {
-      pairs[act].coef=F4mat_to_number_type(npAddM((number)pairs[act].coef,(number)pairs[i].coef));
+      pairs[act].coef=F4mat_to_number_type(npAddM((number)(long)pairs[act].coef,(number)(long)pairs[i].coef));
     }
   }
@@ -1464 +1464 @@
       poly t=terms[j];
       t=p_LmInit(t,r);
-      p_SetCoeff(t,(number) row[j],r);
+      p_SetCoeff(t,(number)(long) row[j],r);
       pNext(t)=h;
       h=t;
@@ -1531 +1531 @@
     for(i=startIndices[row];i<ncols;i++)
     {
-      row_array[i]=F4mat_to_number_type(npMult((number) row_array[i],(number) coef));
+      row_array[i]=F4mat_to_number_type(npMult((number)(long) row_array[i],(number)(long) coef));
     }
   }
@@ -1543 +1543 @@
     assume(start<ncols);
     int other_row;
-    assume(!(npIsZero((number) row_array[start])));
-    if (!(npIsOne((number) coef)))
-      multiplyRow(r,F4mat_to_number_type(npInvers((number) coef)));
-    assume(npIsOne((number) row_array[start]));
+    assume(!(npIsZero((number)(long) row_array[start])));
+    if (!(npIsOne((number)(long) coef)))
+      multiplyRow(r,F4mat_to_number_type(npInvers((number)(long) coef)));
+    assume(npIsOne((number)(long) row_array[start]));
     int lastIndex=modP_lastIndexRow(row_array, ncols);
     number minus_one=npInit(-1, currRing);
@@ -1556 +1556 @@
         int i;
         number_type* other_row_array=rows[other_row];
-        number coef2=npNeg((number) other_row_array[start]);
+        number coef2=npNeg((number)(long) other_row_array[start]);
         if (coef2==minus_one)
         {
@@ -1562 +1562 @@
           {
             if (row_array[i]!=zero)
-              other_row_array[i]=F4mat_to_number_type(npSubM((number) other_row_array[i], (number) row_array[i]));
+              other_row_array[i]=F4mat_to_number_type(npSubM((number)(long) other_row_array[i], (number)(long) row_array[i]));
           }
       }
@@ -1571 +1571 @@
           {
             if (row_array[i]!=zero)
-            other_row_array[i]=F4mat_to_number_type(npAddM(npMult(coef2,(number) row_array[i]),(number) other_row_array[i]));
+            other_row_array[i]=F4mat_to_number_type(npAddM(npMult(coef2,(number)(long) row_array[i]),(number) (long)other_row_array[i]));
           }
         }
         updateStartIndex(other_row,start);
-        assume(npIsZero((number) other_row_array[start]));
+        assume(npIsZero((number)(long) other_row_array[start]));
       }
     }
@@ -1582 +1582 @@
   {
     number_type* row_array=rows[row];
-    assume((lower_bound<0)||(npIsZero((number) row_array[lower_bound])));
+    assume((lower_bound<0)||(npIsZero((number)(long) row_array[lower_bound])));
     int i;
     //number_type zero=npInit(0);
@@ -1637 +1637 @@
     for(i=startIndices[row];i<ncols;i++)
     {
-      row_array[i]=F4mat_to_number_type(npMult((number) row_array[i],(number) coef));
+      row_array[i]=(number_type)(long)(npMult((number)(long) row_array[i],(number)(long) coef));
     }
   }
@@ -1665 +1665 @@
     {
       assume(startIndices[i]<ncols);
-      assume(!(npIsZero((number) rows[i][startIndices[i]])));
+      assume(!(npIsZero((number)(long) rows[i][startIndices[i]])));
       assume(startIndices[i]>=i);
       updateLastReducibleIndex(i,nonZeroUntil+1);
@@ -1694 +1694 @@
     number_type zero=0;//npInit(0);
     number_type* row_array=rows[r];
-    assume((!(npIsZero((number) row_array[start]))));
+    assume((!(npIsZero((number)(long) row_array[start]))));
     assume(start<ncols);
     int other_row;
-    if (!(npIsOne((number) row_array[r])))
+    if (!(npIsOne((number)(long) row_array[r])))
     {
       //it should be one, but this safety is not expensive
-      multiplyRow(r, F4mat_to_number_type(npInvers((number) row_array[start])));
+      multiplyRow(r, (number_type)(long)(npInvers((number)(long) row_array[start])));
     }
     int lastIndex=modP_lastIndexRow(row_array, ncols);
@@ -1711 +1711 @@
       {
         number_type* other_row_array=rows[other_row];
-        number coef=npNeg((number) other_row_array[start]);
+        number coef=((number)(long) other_row_array[start]);
+        coef=npNeg(coef);
         assume(!(npIsZero(coef)));
         int i;
@@ -1718 +1719 @@
         {
           if (row_array[i]!=zero)
-            other_row_array[i]=F4mat_to_number_type(npAddM(npMult(coef,(number)row_array[i]),(number)other_row_array[i]));
+            other_row_array[i]=(number_type)(long)(npAddM(npMult(coef,(number)(long)row_array[i]),(number)(long)other_row_array[i]));
         }
         updateLastReducibleIndex(other_row,r);