From 7f4552a49627593bb097c30058c89b9fa3e4fb74 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 28 May 2014 18:50:36 +0000
Subject: [PATCH] fix warnings
---
Mesh/periodical.cpp | 14 +++++++-------
Mesh/yamakawa.cpp | 4 ++--
Parser/Gmsh.l | 4 ++--
Parser/Gmsh.yy.cpp | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Mesh/periodical.cpp b/Mesh/periodical.cpp
index 9e80a7accc..b2b3d6b63b 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 f3e5ff8916..7d783e6fb1 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 70874f4fe5..5253e2bfb8 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 8044340e77..4bd14b29a1 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' ){ \
--
GitLab