Changeset 20621

Timestamp:

05/18/16 09:36:31 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing bamg compilation warnings

Location:

issm/trunk-jpl/src/c/bamg

Files:

• Mesh.cpp (modified) (4 diffs)
• VertexOnGeom.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/bamg/Mesh.cpp

@@ -238 +238 @@
                 if(VertexOnBThEdge)      delete [] VertexOnBThEdge;
 
-                if(&Gh){
-                        if (Gh.NbRef>0) Gh.NbRef--;
-                        else if (Gh.NbRef==0) delete &Gh;
-                }
-                if(&BTh && (&BTh != this)){
+                if (Gh.NbRef>0) Gh.NbRef--;
+                else if (Gh.NbRef==0) delete &Gh;
+                if(&BTh != this){
                         if (BTh.NbRef>0) BTh.NbRef--;
                         else if (BTh.NbRef==0) delete &BTh;
@@ -3065 +3063 @@
                         Triangle &t=triangles[it];
                         for (int j=0;j<3;j++){
-                                Triangle &tt = *t.TriangleAdj(j);
-                                if ( (!&tt ||  it < GetId(tt)) && ( tt.link || t.link)){
+                                Triangle *ptt=t.TriangleAdj(j);
+                                Triangle &tt = *ptt;
+                                if ( (!ptt ||  it < GetId(tt)) && ( tt.link || t.link)){
                                         BamgVertex &v0 = t[VerticesOfTriangularEdge[j][0]];
                                         BamgVertex &v1 = t[VerticesOfTriangularEdge[j][1]];
@@ -3905 +3904 @@
                                                 _error_("vertices+i != ta.EdgeVertex(1)");
                                         }
-                                        BamgVertex & vj = *(ta.EdgeVertex(0));
-                                        if ( &vj ) {
+                                        BamgVertex *pvj = (ta.EdgeVertex(0));
+                                        BamgVertex & vj = *pvj;
+                                        if(pvj){
                                                 j= &vj-vertices;
                                                 if (j<0 || j >= nbv){
@@ -3959 +3959 @@
                          for (int j=0;j<3;j++)
                           if(!t.Locked(j) && !t.Hidden(j)){
-                                  Triangle &tt = *t.TriangleAdj(j);
-                                  if ( &tt && tt.link && it < GetId(tt)) 
+
+                                  Triangle *ptt = t.TriangleAdj(j);
+                                  Triangle &tt = *ptt;
+
+                                  if( ptt && tt.link && it < GetId(tt)) 
                                          { // an internal edge 
                                           BamgVertex &v0 = t[VerticesOfTriangularEdge[j][0]];

issm/trunk-jpl/src/c/bamg/VertexOnGeom.cpp

@@ -52 +52 @@
         /*}}}*/
         int VertexOnGeom::IsRequiredVertex() {/*{{{*/
-                return this? ((curvilincoord<0 ? (gv?gv->Required():0):0 )) : 0;
+                return ((curvilincoord<0 ? (gv?gv->Required():0):0 ));
         }
         /*}}}*/