From: Jan Engelhardt Date: 2011-09-27 04:06:42.735354010 +0200 Upstream: dead? %i wants an int, not a size_type. Use proper %z specifier. --- app_intsinpolytope.cpp | 4 ++-- app_isgroebnerbasis.cpp | 2 +- app_normalfancleanup.cpp | 2 +- app_secondaryfan.cpp | 6 +++--- app_test.cpp | 2 +- app_tropicaltraverse.cpp | 2 +- bergman.cpp | 4 ++-- buchberger.cpp | 4 ++-- genericwalk.cpp | 2 +- gmpallocator.cpp | 6 +++--- halfopencone.cpp | 6 +++--- lp_cdd.cpp | 4 ++-- minkowskisum.cpp | 2 +- polyhedralfan.cpp | 6 +++--- symmetry.cpp | 2 +- xfig.cpp | 2 +- xfig.h | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) Index: gfan0.5/app_intsinpolytope.cpp =================================================================== --- gfan0.5.orig/app_intsinpolytope.cpp +++ gfan0.5/app_intsinpolytope.cpp @@ -104,7 +104,7 @@ public: } } - fprintf(stderr,"Sets to test: %i\n",setsToCheck.size()); + fprintf(stderr,"Sets to test: %zu\n",setsToCheck.size()); set > ret; for(set >::const_iterator i=setsToCheck.begin();i!=setsToCheck.end();i++) @@ -118,7 +118,7 @@ public: if(isPartOfAZBasis(l))ret.insert(*i); } - fprintf(stderr,"Produced sets: %i\n",ret.size()); + fprintf(stderr,"Produced sets: %zu\n",ret.size()); return ret; } Index: gfan0.5/app_isgroebnerbasis.cpp =================================================================== --- gfan0.5.orig/app_isgroebnerbasis.cpp +++ gfan0.5/app_isgroebnerbasis.cpp @@ -47,7 +47,7 @@ public: IntegerVectorListList sums; IntegerVectorList polytope=minkowski(polytopes,&sums); - fprintf(Stderr,"Number of extreme vertices in Minkowski sum: %i\n",polytope.size()); + fprintf(Stderr,"Number of extreme vertices in Minkowski sum: %zu\n",polytope.size()); bool isGroebnerBasis=false; int counter=0; Index: gfan0.5/app_normalfancleanup.cpp =================================================================== --- gfan0.5.orig/app_normalfancleanup.cpp +++ gfan0.5/app_normalfancleanup.cpp @@ -71,7 +71,7 @@ public: FILE *f=fopen("iteraTIon","w"); if(f) { - fprintf(f,"%i:%i\n",a,l2.size()); + fprintf(f,"%i:%zu\n",a,l2.size()); fclose(f); } } Index: gfan0.5/app_secondaryfan.cpp =================================================================== --- gfan0.5.orig/app_secondaryfan.cpp +++ gfan0.5/app_secondaryfan.cpp @@ -142,7 +142,7 @@ public: while(1) { - fprintf(stdout,"Triangles in current triangulation:%i\n",a.bases.size()); + fprintf(stdout,"Triangles in current triangulation:%zu\n",a.bases.size()); PolyhedralCone C=a.secondaryCone(); C.canonicalize(); @@ -198,7 +198,7 @@ public: while(1) { - fprintf(stdout,"Triangles in current triangulation:%i\n",a.bases.size()); + fprintf(stdout,"Triangles in current triangulation:%zu\n",a.bases.size()); // PolyhedralCone C=a.secondaryCone(); // C.canonicalize(); @@ -214,7 +214,7 @@ public: { Triangulation2 b=a; b.flipNew(-*i); - fprintf(stdout,"Triangles in new triangulation:%i\n",b.bases.size()); + fprintf(stdout,"Triangles in new triangulation:%zu\n",b.bases.size()); if(b.bases.size()==abortAtSize) { Index: gfan0.5/app_test.cpp =================================================================== --- gfan0.5.orig/app_test.cpp +++ gfan0.5/app_test.cpp @@ -128,7 +128,7 @@ public: M[I]=minusOne*M[I]; } - fprintf(Stdout,"Extreme permutations (%i):\n",extreme.size()); + fprintf(Stdout,"Extreme permutations (%zu):\n",extreme.size()); P.printVectorList(extreme); } Index: gfan0.5/app_tropicaltraverse.cpp =================================================================== --- gfan0.5.orig/app_tropicaltraverse.cpp +++ gfan0.5/app_tropicaltraverse.cpp @@ -156,7 +156,7 @@ public: BergmanFan f=bergman(coneGroebnerBasis,idealGroebnerBasis,&s); f.computeMultiplicities(); /* log1 fprintf(Stderr,"Is simplicial: %s\n",f.isSimplicial()?"true":"false");*/ - log1 fprintf(Stderr,"Order of input symmetry group: %i\n",s.elements.size()); + log1 fprintf(Stderr,"Order of input symmetry group: %zu\n",s.elements.size()); log1 fprintf(Stderr,"Number of maximal cones: %i\n",f.numberOfMaximalCones()); log1 fprintf(Stderr,"Modulo the homogeneity space:\n"); log1 AsciiPrinter(Stderr).printVectorList(hv); Index: gfan0.5/bergman.cpp =================================================================== --- gfan0.5.orig/bergman.cpp +++ gfan0.5/bergman.cpp @@ -149,7 +149,7 @@ BergmanFan bergmanRay(PolynomialSet cons if(0) { s=fullColoredIdeals(*g,false); - fprintf(Stderr,"Full colored ideals computed, #=%i\n",s.size()); + fprintf(Stderr,"Full colored ideals computed, #=%zu\n",s.size()); } else { @@ -539,7 +539,7 @@ BergmanFan bergman(PolynomialSet const & while(!active.empty()) { log1 fprintf(Stderr,"\n-------------------------------------\n"); - log1 fprintf(Stderr,"Size of active set: %i, Completed: %i\n",active.size(),ret.cones.size()); + log1 fprintf(Stderr,"Size of active set: %i, Completed: %zu\n",active.size(),ret.cones.size()); log1 fprintf(Stderr,"-------------------------------------\n"); AsciiPrinter p(Stderr); Index: gfan0.5/buchberger.cpp =================================================================== --- gfan0.5.orig/buchberger.cpp +++ gfan0.5/buchberger.cpp @@ -540,7 +540,7 @@ void buchberger2(PolynomialSet *g, TermO { static int t; t++; - if((t&31)==0)fprintf(Stderr," spolys:%i\n",sPolynomials.size()); + if((t&31)==0)fprintf(Stderr," spolys:%zu\n",sPolynomials.size()); } { @@ -565,7 +565,7 @@ void buchberger2(PolynomialSet *g, TermO { static int t; if(((++t)&=31)==0) - fprintf(Stderr,"gsize:%i spolys:%i\n",g->size()+1,sPolynomials.size()); + fprintf(Stderr,"gsize:%zu spolys:%zu\n",g->size()+1,sPolynomials.size()); } PolynomialSet::iterator j=g->end();j--; updatePairs(sPolynomials,g,&redundantOnes,j,indexj,truncationDegree,&grading); Index: gfan0.5/genericwalk.cpp =================================================================== --- gfan0.5.orig/genericwalk.cpp +++ gfan0.5/genericwalk.cpp @@ -202,7 +202,7 @@ PolynomialSet genericWalkPerturbation(Po g=newG; nflips++; - fprintf(Stderr,"Flip %i, new size %i\n",nflips,g.size()); + fprintf(Stderr,"Flip %i, new size %zu\n",nflips,g.size()); } fprintf(Stderr,"Number of flips:%i\n",nflips); Index: gfan0.5/gmpallocator.cpp =================================================================== --- gfan0.5.orig/gmpallocator.cpp +++ gfan0.5/gmpallocator.cpp @@ -145,19 +145,19 @@ void myDeallocateFunction (void *ptr, si //Debug void *myAllocateFunctionD(size_t alloc_size) { - fprintf(stderr,"Allocating: %i bytes.\n",alloc_size); + fprintf(stderr,"Allocating: %zu bytes.\n",alloc_size); return malloc(alloc_size); } void *myReallocateFunctionD(void *ptr, size_t old_size, size_t new_size) { - fprintf(stderr,"Reallocating: %i --> %i bytes.\n",old_size,new_size); + fprintf(stderr,"Reallocating: %zu --> %zu bytes.\n",old_size,new_size); return realloc(ptr,new_size); } void myDeallocateFunctionD(void *ptr, size_t size) { - fprintf(stderr,"Freeing: %i bytes.\n",size); + fprintf(stderr,"Freeing: %zu bytes.\n",size); return free(ptr); } Index: gfan0.5/halfopencone.cpp =================================================================== --- gfan0.5.orig/halfopencone.cpp +++ gfan0.5/halfopencone.cpp @@ -555,14 +555,14 @@ HalfOpenConeList tropicalHyperSurfaceInt { HalfOpenConeList surface=tropicalHyperSurface(*i); - fprintf(Stderr,"Number of cones in current intersection:%i\n",intersection.size()); - fprintf(Stderr,"Number of cones in next surface:%i\n",surface.size()); + fprintf(Stderr,"Number of cones in current intersection:%zu\n",intersection.size()); + fprintf(Stderr,"Number of cones in next surface:%zu\n",surface.size()); fprintf(Stderr,"A\n"); intersection=refinement(intersection,surface); fprintf(Stderr,"B\n"); } - fprintf(Stderr,"%i",intersection.size()); + fprintf(Stderr,"%zu",intersection.size()); return intersection; } Index: gfan0.5/lp_cdd.cpp =================================================================== --- gfan0.5.orig/lp_cdd.cpp +++ gfan0.5/lp_cdd.cpp @@ -1287,8 +1287,8 @@ void LpSolverCddGmp::removeRedundantRows if(A->rowsize!=newLin.size()+newIn.size()) { fprintf(stderr,"A->rowsize: %i\n",(int)A->rowsize); - fprintf(stderr,"newLin.size(): %i\n",newLin.size()); - fprintf(stderr,"newIn.size(): %i\n",newIn.size()); + fprintf(stderr,"newLin.size(): %zu\n",newLin.size()); + fprintf(stderr,"newIn.size(): %zu\n",newIn.size()); dd_WriteMatrix(Stderr,A); Index: gfan0.5/minkowskisum.cpp =================================================================== --- gfan0.5.orig/minkowskisum.cpp +++ gfan0.5/minkowskisum.cpp @@ -27,7 +27,7 @@ IntegerVectorList minkowski(IntegerVecto assert(f); { - fprintf(f,"%i",polytopes.size()); + fprintf(f,"%zu",polytopes.size()); TopcomPrinter p(f); //AsciiPrinter p(f); Index: gfan0.5/polyhedralfan.cpp =================================================================== --- gfan0.5.orig/polyhedralfan.cpp +++ gfan0.5/polyhedralfan.cpp @@ -604,7 +604,7 @@ PolyhedralFan PolyhedralFan::rayComplexS { // log0 fprintf(Stderr,"rayComplexSymmetry - begin\n"); PolyhedralFan ret(n); - log1 fprintf(Stderr,"Computing rays of %i cones\n",cones.size()); + log1 fprintf(Stderr,"Computing rays of %zu cones\n",cones.size()); for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++) { { @@ -812,7 +812,7 @@ IntegerVectorList PolyhedralFan::getRays SymmetryGroup localsym(n); if(!sym)sym=&localsym; set rays; - log1 fprintf(Stderr,"Computing rays of %i cones\n",cones.size()); + log1 fprintf(Stderr,"Computing rays of %zu cones\n",cones.size()); for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++) { { @@ -1212,7 +1212,7 @@ void addFacesToSymmetricComplex(Symmetri static int t; if((t&1023)==0) { - fprintf(Stderr,"clist size:%i\n",clist.size()); + fprintf(Stderr,"clist size:%zu\n",clist.size()); } t++; } Index: gfan0.5/symmetry.cpp =================================================================== --- gfan0.5.orig/symmetry.cpp +++ gfan0.5/symmetry.cpp @@ -300,7 +300,7 @@ void SymmetryGroup::print(FILE *f) l.push_back(*i); } P.printVectorList(l); - fprintf(f,"Group order=%i\n",elements.size()); + fprintf(f,"Group order=%zu\n",elements.size()); P.printString("Done printing SymmetryGroup.\n"); } Index: gfan0.5/xfig.cpp =================================================================== --- gfan0.5.orig/xfig.cpp +++ gfan0.5/xfig.cpp @@ -103,7 +103,7 @@ void XFig::drawPolygon(const Polygon &ve { if(vertices.size()) { - fprintf(f,"2 3 0 1 0 %i 50 0 25 0.000 0 0 -1 0 0 %i\n ",7,vertices.size()+1); + fprintf(f,"2 3 0 1 0 %i 50 0 25 0.000 0 0 -1 0 0 %zu\n ",7,vertices.size()+1); for(Polygon::const_iterator i=vertices.begin();i!=vertices.end();i++) kickPoint(*i,mode); Index: gfan0.5/xfig.h =================================================================== --- gfan0.5.orig/xfig.h +++ gfan0.5/xfig.h @@ -52,7 +52,7 @@ class XFig void endDrawLine() { assert(p.size()>0); - fprintf(f," %i\n",p.size()); + fprintf(f," %zu\n",p.size()); if(arrowOrigin) fprintf(f,"\t 2 1 1.00 60.00 120.00\n"); if(arrowTarget)