Changeset 32c80f in git

Timestamp:

Jul 15, 2010, 12:30:02 AM (13 years ago)

Author:

Alexander Dreyer <dreyer@…>

Branches:

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

Children:

d56cdae01f2cd4bd0d5e6cf03bbe3672345b236d

Parents:

0d348b91bd5d226ba799178daca46300068b6d0a

Message:

FIX: ambigous overload of si_max resolved

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

Files:

• Singular/ipprint.cc (modified) (2 diffs)
• kernel/longrat0.cc (modified) (1 diff)

Singular/ipprint.cc

@@ -69 +69 @@
     ss=(char *)omAlloc(14+strlen(name));
     sprintf(ss,"%s[%d,%d]",name,MATCOLS(m),MATROWS(m));
-    vl=si_max(vl,strlen(ss));
+    vl=si_max(vl,(int)strlen(ss));
     omFree(ss);
 
@@ -99 +99 @@
           {
             strcat(ss,",");
-            vl=si_max(vl,strlen(ss));
+            vl=si_max(vl,(int)strlen(ss));
           }
         }

kernel/longrat0.cc

@@ -128 +128 @@
     }
     int l=mpz_sizeinbase(a->z,10);
-    if (a->s<2) l=si_max(l,mpz_sizeinbase(a->n,10));
+    if (a->s<2) l=si_max(l,(int)mpz_sizeinbase(a->n,10));
     l+=2;
     s=(char*)omAlloc(l);