Changeset 5f4463 in git for kernel/tgb_internal.h

Timestamp:

Apr 11, 2011, 6:39:34 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

5beac5a8a177a4d4938cbc1e887bbd115a393f3a

Parents:

16733868763266ec04dae72db238bced32663735

Message:

making the sun-c/c++ compiler happy (still waiting for to issues...)



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

File:

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

kernel/tgb_internal.h

@@ -280 +280 @@
   int pTotaldegree_full(poly p)
   {
-    int r=0;
+    int rr=0;
     while(p)
     {
       int d=this->pTotaldegree(p);
-      r=si_max(r,d);
+      rr=si_max(rr,d);
       pIter(p);
     }
-    return r;
+    return rr;
   }
 };
@@ -378 +378 @@
   int p_len;
   int reducer_deg;
-  simple_reducer(poly p, int p_len,int reducer_deg, slimgb_alg* c =NULL)
-  {
-    this->p=p;
-    this->reducer_deg=reducer_deg;
-    assume(p_len==pLength(p));
-    this->p_len=p_len;
-    this->c=c;
+  simple_reducer(poly pp, int pp_len,int pp_reducer_deg, slimgb_alg* pp_c =NULL)
+  {
+    this->p=pp;
+    this->reducer_deg=pp_reducer_deg;
+    assume(pp_len==pLength(pp));
+    this->p_len=pp_len;
+    this->c=pp_c;
   }
   virtual void pre_reduce(red_object* r, int l, int u);
@@ -1503 +1503 @@
 
   int ncols,nrows;
-  ModPMatrixProxyOnArray(number_type* array, int nrows, int ncols){
-    this->ncols=ncols;
-    this->nrows=nrows;
-    rows=(number_type**) omalloc(nrows*sizeof(number_type*));
-    startIndices=(int*)omalloc(nrows*sizeof(int));
+  ModPMatrixProxyOnArray(number_type* array, int nnrows, int nncols)
+  {
+    this->ncols=nncols;
+    this->nrows=nnrows;
+    rows=(number_type**) omalloc(nnrows*sizeof(number_type*));
+    startIndices=(int*)omalloc(nnrows*sizeof(int));
     int i;
-    for(i=0;i<nrows;i++)
-    {
-      rows[i]=array+(i*ncols);
+    for(i=0;i<nnrows;i++)
+    {
+      rows[i]=array+(i*nncols);
       updateStartIndex(i,-1);
     }