diff --git a/Mesh/periodical.cpp b/Mesh/periodical.cpp index 9e80a7accc3a3b0fcdef9a5074696e4dea31c01b..b2b3d6b63bab95f84b4ddb2e2660d1d1fd5c2c11 100644 --- a/Mesh/periodical.cpp +++ b/Mesh/periodical.cpp @@ -190,7 +190,7 @@ void voroMetal3D::execute(std::vector<SPoint3>& vertices,std::vector<double>& ra // wall_cylinder cyl(.5,.5,-3,0,0,6,.4); // contA.add_wall(cyl); - + for(i=0;i<vertices.size();i++){ if(radical==0){ @@ -201,8 +201,8 @@ void voroMetal3D::execute(std::vector<SPoint3>& vertices,std::vector<double>& ra } } - number = 0; - + number = 0; + c_loop_all loopA(contA); c_loop_all loopB(contB); @@ -236,11 +236,11 @@ void voroMetal3D::execute(std::vector<SPoint3>& vertices,std::vector<double>& ra } std::ofstream file6("table.txt"); - + for(i=0;i<vertices.size();i++){ file6 << i+1 << " " << table[i]+1 << "\n"; - } - + } + initialize_counter(); min_area = 1000000000.0; @@ -558,7 +558,7 @@ void voroMetal3D::correspondance(double e, double xMax, double yMax, double zMax } for(i=0;i<faces.size();i++){ - markings.insert(std::pair<GFace*,bool>(faces[i],0)); + markings.insert(std::pair<GFace*,bool>(faces[i],false)); } count = 0; diff --git a/Mesh/yamakawa.cpp b/Mesh/yamakawa.cpp index f3e5ff891635e953251c40e7325c75b229c0fceb..7d783e6fb1980be5b2fe6f4b31e077aa28ccce5b 100644 --- a/Mesh/yamakawa.cpp +++ b/Mesh/yamakawa.cpp @@ -373,7 +373,7 @@ void Recombinator::init_markings(GRegion* gr){ for(i=0;i<gr->getNumMeshElements();i++){ element = gr->getMeshElement(i); - markings.insert(std::pair<MElement*,bool>(element,0)); + markings.insert(std::pair<MElement*,bool>(element,false)); } } @@ -3882,7 +3882,7 @@ void PostOp::pyramids1(MVertex* a,MVertex* b,MVertex* c,MVertex* d,GRegion* gr){ for(it=bin2.begin();it!=bin2.end();it++){ bin.insert(*it); } - + if(bin.size()==2){ it = bin.begin(); it1 = markings.find(*it); diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l index 70874f4fe596c5b5f3bec463b97d90c3bb23a625..5253e2bfb8377293403f061b18c3c8f774872446 100644 --- a/Parser/Gmsh.l +++ b/Parser/Gmsh.l @@ -23,7 +23,7 @@ void skipline(void); #define YY_INPUT(buf,result,max_size) \ { \ int c = '*', n; \ - for ( n = 0; n < max_size && \ + for ( n = 0; n < (int) max_size && \ (c = gzgetc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ){ \ @@ -42,7 +42,7 @@ void skipline(void); #define YY_INPUT(buf,result,max_size) \ { \ int c = '*', n; \ - for ( n = 0; n < max_size && \ + for ( n = 0; n < (int) max_size && \ (c = fgetc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ){ \ diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp index 8044340e77ca918712b2083cd6ed571697ff94bc..4bd14b29a1a650e2dc7a6e7b4365f11d084ad71a 100644 --- a/Parser/Gmsh.yy.cpp +++ b/Parser/Gmsh.yy.cpp @@ -1039,7 +1039,7 @@ void skipline(void); #define YY_INPUT(buf,result,max_size) \ { \ int c = '*', n; \ - for ( n = 0; n < max_size && \ + for ( n = 0; n < (int) max_size && \ (c = gzgetc( gmsh_yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ){ \ @@ -1058,7 +1058,7 @@ void skipline(void); #define YY_INPUT(buf,result,max_size) \ { \ int c = '*', n; \ - for ( n = 0; n < max_size && \ + for ( n = 0; n < (int) max_size && \ (c = fgetc( gmsh_yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ if ( c == '\n' ){ \