Skip to content
Snippets Groups Projects
Commit 367c2037 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix gcc warnings

parent 4d7644f8
Branches
Tags
No related merge requests found
...@@ -78,6 +78,7 @@ MElement *const *GFace::getStartElementType(int type) const ...@@ -78,6 +78,7 @@ MElement *const *GFace::getStartElementType(int type) const
case 1: case 1:
return reinterpret_cast<MElement *const *>(&quadrangles[0]); return reinterpret_cast<MElement *const *>(&quadrangles[0]);
} }
return 0;
} }
MElement *GFace::getMeshElement(unsigned int index) MElement *GFace::getMeshElement(unsigned int index)
......
...@@ -68,6 +68,7 @@ MElement *const *GRegion::getStartElementType(int type) const ...@@ -68,6 +68,7 @@ MElement *const *GRegion::getStartElementType(int type) const
case 3: case 3:
return reinterpret_cast<MElement *const *>(&pyramids[0]); return reinterpret_cast<MElement *const *>(&pyramids[0]);
} }
return 0;
} }
MElement *GRegion::getMeshElement(unsigned int index) MElement *GRegion::getMeshElement(unsigned int index)
......
...@@ -455,9 +455,10 @@ class MLineN : public MLine { ...@@ -455,9 +455,10 @@ class MLineN : public MLine {
{ {
v.resize(2 + _vs.size()); v.resize(2 + _vs.size());
MLine::_getEdgeVertices(v); MLine::_getEdgeVertices(v);
for(int i = 0; i != _vs.size(); ++i) v[i+2] = _vs[i]; for(unsigned int i = 0; i != _vs.size(); ++i) v[i+2] = _vs[i];
} }
virtual int getTypeForMSH(){ virtual int getTypeForMSH()
{
if(_vs.size() == 2) return MSH_LIN_4; if(_vs.size() == 2) return MSH_LIN_4;
if(_vs.size() == 3) return MSH_LIN_5; if(_vs.size() == 3) return MSH_LIN_5;
if(_vs.size() == 4) return MSH_LIN_6; if(_vs.size() == 4) return MSH_LIN_6;
...@@ -784,7 +785,7 @@ class MTriangleN : public MTriangle { ...@@ -784,7 +785,7 @@ class MTriangleN : public MTriangle {
{ {
v.resize(3 + _vs.size()); v.resize(3 + _vs.size());
MTriangle::_getFaceVertices(v); MTriangle::_getFaceVertices(v);
for(int i = 0; i != _vs.size(); ++i) v[i+3] = _vs[i]; for(unsigned int i = 0; i != _vs.size(); ++i) v[i + 3] = _vs[i];
} }
virtual int getTypeForMSH() virtual int getTypeForMSH()
{ {
......
...@@ -65,7 +65,7 @@ static void buildInterpLc(const std::vector<IntPoint> &lcPoints) ...@@ -65,7 +65,7 @@ static void buildInterpLc(const std::vector<IntPoint> &lcPoints)
{ {
IntPoint p; IntPoint p;
interpLc.clear(); interpLc.clear();
for(int i = 0; i < lcPoints.size(); i++){ for(unsigned int i = 0; i < lcPoints.size(); i++){
p = lcPoints[i]; p = lcPoints[i];
interpLc.push_back(xi2lc(p.t, p.lc)); interpLc.push_back(xi2lc(p.t, p.lc));
} }
......
...@@ -350,13 +350,13 @@ bool gmshEdgeFront::formQuad (BDS_Edge *e, ...@@ -350,13 +350,13 @@ bool gmshEdgeFront::formQuad (BDS_Edge *e,
toUpdate.push_back(pleft); toUpdate.push_back(pleft);
toUpdate.push_back(pright); toUpdate.push_back(pright);
for (int i=0;i<toUpdate.size();i++){ for (unsigned int i=0;i<toUpdate.size();i++){
toUpdate[i]->config_modified = true; toUpdate[i]->config_modified = true;
bool done = m->smooth_point_parametric(toUpdate[i], gf); bool done = m->smooth_point_parametric(toUpdate[i], gf);
// printf("smooth done %d (g %d)\n",done,toUpdate[i]->g->classif_degree); // printf("smooth done %d (g %d)\n",done,toUpdate[i]->g->classif_degree);
} }
for (int i=0;i<toUpdate.size();i++){ for (unsigned int i=0;i<toUpdate.size();i++){
BDS_Point *p = toUpdate[i]; BDS_Point *p = toUpdate[i];
for (std::list<BDS_Edge*>::iterator itp = p->edges.begin(); itp != p->edges.end() ; ++ itp){ for (std::list<BDS_Edge*>::iterator itp = p->edges.begin(); itp != p->edges.end() ; ++ itp){
if (inFront(*itp)){ if (inFront(*itp)){
...@@ -538,8 +538,8 @@ static int numQuads ( BDS_Mesh *m) ...@@ -538,8 +538,8 @@ static int numQuads ( BDS_Mesh *m)
return N; return N;
} }
int gmshQMorph (GFace *gf) { int gmshQMorph (GFace *gf)
{
// assert first that there exist a triangulation of // assert first that there exist a triangulation of
// the face // the face
if (!gf->triangles.size()){ if (!gf->triangles.size()){
...@@ -586,6 +586,6 @@ int gmshQMorph (GFace *gf) { ...@@ -586,6 +586,6 @@ int gmshQMorph (GFace *gf) {
} }
// delete the BDS // delete the BDS
delete pm; delete pm;
return 1;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment