Changeset 11401

Timestamp:

02/13/12 07:47:29 (13 years ago)

Author:

Eric.Larour

Message:

Missing return statements! This only got caught by the Microsoft Visual Studio compiler! The
world is officially upside down!

Location:

issm/trunk-jpl/src/c

Files:

• modules/BamgTriangulatex/BamgTriangulatex.cpp (modified) (1 diff)
• modules/Chacox/Chacox.cpp (modified) (1 diff)
• modules/Chacox/input_parse.cpp (modified) (1 diff)
• modules/ContourToMeshx/ContourToMeshxt.cpp (modified) (1 diff)
• modules/ContourToNodesx/ContourToNodesx.cpp (modified) (1 diff)
• modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp (modified) (1 diff)
• modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp (modified) (1 diff)
• modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp (modified) (1 diff)
• modules/Scotchx/Scotchx.cpp (modified) (1 diff)
• modules/Shp2Kmlx/Shp2Kmlx.cpp (modified) (2 diffs)
• shared/Numerics/Verbosity.cpp (modified) (1 diff)
• shared/TriMesh/TriMeshUtils.cpp (modified) (2 diffs)
• shared/TriMesh/trimesh.h (modified) (1 diff)

issm/trunk-jpl/src/c/modules/BamgTriangulatex/BamgTriangulatex.cpp

@@ -17 +17 @@
         Th.WriteIndex(pindex,pnels);
         //delete &Th;
+        return 0;
 
 }

issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp

@@ -191 +191 @@
 
 
-        #endif //ifdef _HAVE_CHACO_
+        #else //ifdef _HAVE_CHACO_
+        return (0);
+        #endif
 }

issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp

@@ -262 +262 @@
         return(0);
 
-        #endif //#ifdef _HAVE_CHACO_ 
+        #else //#ifdef _HAVE_CHACO_ 
+        return(0);
+        #endif
 }

issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp

@@ -69 +69 @@
         }
 
+        return NULL;
+
 }

issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp

@@ -36 +36 @@
         /*Assign output pointers: */
         *pflags=flags;
-
+        
+        return 1;
 }

issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp

@@ -126 +126 @@
         }
         if (debug && my_thread==0) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
+        
+        return NULL;
 
 }

issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp

@@ -36 +36 @@
         /*Assign output pointers: */
         *pflags=flags;
+
+        return 1;
 }

issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp

@@ -74 +74 @@
         /*Free ressources:*/
         xfree((void**)&already);
+        
+        return NULL;
 }

issm/trunk-jpl/src/c/modules/Scotchx/Scotchx.cpp

@@ -339 +339 @@
   return (0);
 
-#endif //#ifdef _HAVE_SCOTCH_ 
+#else //#ifdef _HAVE_SCOTCH_ 
+  return(0);
+#endif
 }

issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

@@ -24 +24 @@
                                         sgn,cm,sp));
 
-        #endif //ifdef _HAVE_SHAPELIB_
+        #else //ifdef _HAVE_SHAPELIB_
+        return 0;
+        #endif
 }
 
@@ -607 +609 @@
         return(iret);
 
-        #endif //ifdef _HAVE_SHAPELIB_
+        #else //ifdef _HAVE_SHAPELIB_
+        return 0;
+        #endif
 }
 

issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp

@@ -64 +64 @@
 
         verbositylevel = (int)level;
+        return verbositylevel;
 
 #else

issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp

@@ -124 +124 @@
 ******************************************************************************************************************************/
 
-int RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments){
+void RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments){
         
         int i,counter;
@@ -379 +379 @@
                                    IsInPoly
 ******************************************************************************************************************************/
-int IsInPoly(double* in,double* xc,double* yc,int numnodes,double* x,double* y,int nods){
-
-        int i;
-        double x0,y0;
-
-        /*Go through all nodes of the mesh:*/
-        for (i=0;i<nods;i++){
-                if (in[i]){
-                        /*this node already is inside one of the contours, continue*/
-                        continue;
-                }
-                /*pick up node: */
-                x0=x[i];
-                y0=y[i];
-                if (pnpoly(numnodes,xc,yc,x0,y0)){
-                        in[i]=1;
-                }
-        }
-}
+//void IsInPoly(double* in,double* xc,double* yc,int numnodes,double* x,double* y,int nods){
+//
+//      int i;
+//      double x0,y0;
+//
+//      /*Go through all nodes of the mesh:*/
+//      for (i=0;i<nods;i++){
+//              if (in[i]){
+//                      /*this node already is inside one of the contours, continue*/
+//                      continue;
+//              }
+//              /*pick up node: */
+//              x0=x[i];
+//              y0=y[i];
+//              if (pnpoly(numnodes,xc,yc,x0,y0)){
+//                      in[i]=1;
+//              }
+//      }
+//}
 
 /******************************************************************************************************************************

issm/trunk-jpl/src/c/shared/TriMesh/trimesh.h

@@ -26 +26 @@
 int IsNeighbor(int el1,int el2,double* index);
 int IsOnRift(int el,int nriftsegs,int* riftsegments);
-int RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments);
+void RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments);
 int DetermineGridElementListOnOneSideOfRift(int* pNumGridElementListOnOneSideOfRift, int** pGridElementListOnOneSideOfRift, int segmentnumber, int nriftsegs, int* riftsegments, int node,double* index,int nel);
 int UpdateSegments(double** psegments,double** psegmentmarkerlist, int* pnsegs, double* index, double* x,double* y,int* riftsegments,int nriftsegs);