Changeset 13250


Ignore:
Timestamp:
09/04/12 16:25:43 (13 years ago)
Author:
Mathieu Morlighem
Message:

CHG: getting rid of xfree

Location:
issm/trunk-jpl/src/modules
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/modules/Chaco/Chaco.cpp

    r13236 r13250  
    119119
    120120        /*Free ressources:*/
    121         xfree((void**)&assignment);
    122         xfree((void**)&goal);
    123         xfree((void**)&nparts);
    124         xfree((void**)&z);
    125         xfree((void**)&y);
    126         xfree((void**)&x);
    127         xfree((void**)&ewgts);
    128         xfree((void**)&vwgts);
    129         xfree((void**)&adjacency);
    130         xfree((void**)&start);
    131         xfree((void**)&doubleassignment);
     121        xDelete<short>(assignment);
     122        xDelete<double>(goal);
     123        xDelete<int>(nparts);
     124        xDelete<float>(z);
     125        xDelete<float>(y);
     126        xDelete<float>(x);
     127        xDelete<float>(ewgts);
     128        xDelete<int>(vwgts);
     129        xDelete<int>(adjacency);
     130        xDelete<int>(start);
     131        xDelete<double>(doubleassignment);
    132132
    133133        /*end module: */

  • issm/trunk-jpl/src/modules/Exp2Kml/Exp2Kml.cpp

    r13236 r13250  
    8787
    8888        /*Clean-up*/
    89         xfree((void**)&choles);
     89        xDelete<char>(choles);
     90        xDelete<char>(filkml);
     91        xDelete<char>(filexp);
    9092        delete options;
    91         xfree((void**)&filkml);
    92         xfree((void**)&filexp);
    9393
    9494        /*end module: */

  • issm/trunk-jpl/src/modules/InternalFront/InternalFront.cpp

    r13236 r13250  
    8989                for(i=0;i<4*numberofsegments;i++) front2[i]=(double)front[i];
    9090        }
    91         xfree((void**)&front);
     91        xDelete<int>(front);
    9292
    9393        /*write output datasets: */

  • issm/trunk-jpl/src/modules/KMLFileRead/KMLFileRead.cpp

    r13236 r13250  
    118118
    119119        /*Clean-up*/
    120         xfree((void**)&write);
    121         xfree((void**)&deepecho);
    122         xfree((void**)&echo);
     120        xDelete<char>(write);
     121        xDelete<char>(deepecho);
     122        xDelete<char>(echo);
    123123        delete options;
    124124

  • issm/trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.cpp

    r13236 r13250  
    142142        /*Clean-up*/
    143143        delete options;
    144         if (mxIsCell(NOTES) && notes) xfree((void**)&notes);
     144        if (mxIsCell(NOTES) && notes) xDelete<char>(notes);
    145145
    146146        /*end module: */

  • issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp

    r13236 r13250  
    112112
    113113                if (mexEvalString(czip)) _error_("Error zipping file \"" << filkmz << "\".");
    114                 xfree((void**)&czip);
    115                 xfree((void**)&filkmz);
     114                xDelete<char>(czip);
     115                xDelete<char>(filkmz);
    116116        }
    117117
    … …  
    121121        /*Clean-up*/
    122122        if (pimages) {
    123                 for (i=nimages; i>0; i--) xfree((void**)&(pimages[i-1]));
    124                 xfree((void**)&pimages);
     123                for (i=nimages; i>0; i--) xDelete<char>(pimages[i-1]);
     124                xDelete<char*>(pimages);
    125125        }
    126         xfree((void**)&longaxis);
    127         xfree((void**)&lataxis);
     126        xDelete<double>(longaxis);
     127        xDelete<double>(lataxis);
     128        xDelete<char>(filkml);
    128129        delete options;
    129         xfree((void**)&filkml);
    130130
    131131        /*end module: */

  • issm/trunk-jpl/src/modules/Kml2Exp/Kml2Exp.cpp

    r13236 r13250  
    8080
    8181        /*Clean-up*/
     82        xDelete<char>(filexp);
     83        xDelete<char>(filkml);
    8284        delete options;
    83         xfree((void**)&filexp);
    84         xfree((void**)&filkml);
    8585
    8686        /*end module: */

  • issm/trunk-jpl/src/modules/Kriging/Kriging.cpp

    r13236 r13250  
    6060
    6161        /*Free ressources: */
    62         xfree((void**)&x);
    63         xfree((void**)&y);
    64         xfree((void**)&observations);
    65         xfree((void**)&x_interp);
    66         xfree((void**)&y_interp);
    67         xfree((void**)&predictions);
    68         xfree((void**)&error);
     62        xDelete<double>(x);
     63        xDelete<double>(y);
     64        xDelete<double>(observations);
     65        xDelete<double>(x_interp);
     66        xDelete<double>(y_interp);
     67        xDelete<double>(predictions);
     68        xDelete<double>(error);
     69        delete options;
    6970
    7071        /*end module: */

  • issm/trunk-jpl/src/modules/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp

    r13236 r13250  
    3939
    4040        /*Free ressources: */
    41         xfree((void**)&connectivity);
    42         xfree((void**)&flags);
     41        xDelete<double>(connectivity);
     42        xDelete<double>(flags);
    4343
    4444        /*end module: */

  • issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp

    r13236 r13250  
    9292        /*Clean-up*/
    9393        delete options;
    94         xfree((void**)&filkml);
    95         xfree((void**)&filshp);
     94        xDelete<char>(filkml);
     95        xDelete<char>(filshp);
    9696
    9797        /*end module: */
Note: See TracChangeset for help on using the changeset viewer.