Changeset 11401


Ignore:
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:
13 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/modules/BamgTriangulatex/BamgTriangulatex.cpp

    r10205 r11401  
    1717        Th.WriteIndex(pindex,pnels);
    1818        //delete &Th;
     19        return 0;
    1920
    2021}
  • issm/trunk-jpl/src/c/modules/Chacox/Chacox.cpp

    r4648 r11401  
    191191
    192192
    193         #endif //ifdef _HAVE_CHACO_
     193        #else //ifdef _HAVE_CHACO_
     194        return (0);
     195        #endif
    194196}
  • issm/trunk-jpl/src/c/modules/Chacox/input_parse.cpp

    r4648 r11401  
    262262        return(0);
    263263
    264         #endif //#ifdef _HAVE_CHACO_
     264        #else //#ifdef _HAVE_CHACO_
     265        return(0);
     266        #endif
    265267}
  • issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp

    r9320 r11401  
    6969        }
    7070
     71        return NULL;
     72
    7173}
  • issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp

    r8303 r11401  
    3636        /*Assign output pointers: */
    3737        *pflags=flags;
    38 
     38       
     39        return 1;
    3940}
  • issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp

    r7145 r11401  
    126126        }
    127127        if (debug && my_thread==0) printf("\b\b\b\b\b\b\b%5.2lf %%\n",100.0);
     128       
     129        return NULL;
    128130
    129131}
  • issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsx.cpp

    r7640 r11401  
    3636        /*Assign output pointers: */
    3737        *pflags=flags;
     38
     39        return 1;
    3840}
  • issm/trunk-jpl/src/c/modules/PointCloudFindNeighborsx/PointCloudFindNeighborsxt.cpp

    r7649 r11401  
    7474        /*Free ressources:*/
    7575        xfree((void**)&already);
     76       
     77        return NULL;
    7678}
  • issm/trunk-jpl/src/c/modules/Scotchx/Scotchx.cpp

    r4656 r11401  
    339339  return (0);
    340340
    341 #endif //#ifdef _HAVE_SCOTCH_
     341#else //#ifdef _HAVE_SCOTCH_
     342  return(0);
     343#endif
    342344}
  • issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

    r10380 r11401  
    2424                                        sgn,cm,sp));
    2525
    26         #endif //ifdef _HAVE_SHAPELIB_
     26        #else //ifdef _HAVE_SHAPELIB_
     27        return 0;
     28        #endif
    2729}
    2830
     
    607609        return(iret);
    608610
    609         #endif //ifdef _HAVE_SHAPELIB_
     611        #else //ifdef _HAVE_SHAPELIB_
     612        return 0;
     613        #endif
    610614}
    611615
  • issm/trunk-jpl/src/c/shared/Numerics/Verbosity.cpp

    r9320 r11401  
    6464
    6565        verbositylevel = (int)level;
     66        return verbositylevel;
    6667
    6768#else
  • issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp

    r9320 r11401  
    124124******************************************************************************************************************************/
    125125
    126 int RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments){
     126void RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments){
    127127       
    128128        int i,counter;
     
    379379                                   IsInPoly
    380380******************************************************************************************************************************/
    381 int IsInPoly(double* in,double* xc,double* yc,int numnodes,double* x,double* y,int nods){
    382 
    383         int i;
    384         double x0,y0;
    385 
    386         /*Go through all nodes of the mesh:*/
    387         for (i=0;i<nods;i++){
    388                 if (in[i]){
    389                         /*this node already is inside one of the contours, continue*/
    390                         continue;
    391                 }
    392                 /*pick up node: */
    393                 x0=x[i];
    394                 y0=y[i];
    395                 if (pnpoly(numnodes,xc,yc,x0,y0)){
    396                         in[i]=1;
    397                 }
    398         }
    399 }
     381//void IsInPoly(double* in,double* xc,double* yc,int numnodes,double* x,double* y,int nods){
     382//
     383//      int i;
     384//      double x0,y0;
     385//
     386//      /*Go through all nodes of the mesh:*/
     387//      for (i=0;i<nods;i++){
     388//              if (in[i]){
     389//                      /*this node already is inside one of the contours, continue*/
     390//                      continue;
     391//              }
     392//              /*pick up node: */
     393//              x0=x[i];
     394//              y0=y[i];
     395//              if (pnpoly(numnodes,xc,yc,x0,y0)){
     396//                      in[i]=1;
     397//              }
     398//      }
     399//}
    400400
    401401/******************************************************************************************************************************
  • issm/trunk-jpl/src/c/shared/TriMesh/trimesh.h

    r9320 r11401  
    2626int IsNeighbor(int el1,int el2,double* index);
    2727int IsOnRift(int el,int nriftsegs,int* riftsegments);
    28 int RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments);
     28void RiftSegmentsFromSegments(int* pnriftsegs, int** priftsegments, int nel, double* index, int nsegs,double* segments);
    2929int DetermineGridElementListOnOneSideOfRift(int* pNumGridElementListOnOneSideOfRift, int** pGridElementListOnOneSideOfRift, int segmentnumber, int nriftsegs, int* riftsegments, int node,double* index,int nel);
    3030int UpdateSegments(double** psegments,double** psegmentmarkerlist, int* pnsegs, double* index, double* x,double* y,int* riftsegments,int nriftsegs);
Note: See TracChangeset for help on using the changeset viewer.