Changeset 12946 for issm/branches/trunk-jpl-damage/src/c/classes/objects/KML/KML_MultiGeometry.cpp

Timestamp:

08/08/12 14:38:52 (13 years ago)

Author:

cborstad

Message:

CHG: merged trunk-jpl into branch through revision 12945

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/classes/objects/KML/KML_MultiGeometry.cpp (modified) (3 diffs)

issm/branches/trunk-jpl-damage/src/c/classes/objects/KML/KML_MultiGeometry.cpp

@@ -136 +136 @@
                                                           &ncom,&pcom)) {
                 if      (!strncmp(kstri,"</MultiGeometry",15)) {
-                        xfree((void**)&kstri);
+                        xDelete<char>(kstri);
                         break;
                 }
@@ -177 +177 @@
                         KML_Geometry::Read(fid,kstri);
 
-                xfree((void**)&kstri);
+                xDelete<char>(kstri);
         }
 
@@ -183 +183 @@
 
         for (ncom; ncom>0; ncom--)
-                xfree((void**)&(pcom[ncom-1]));
-        xfree((void**)&pcom);
+                xDelete<char>(pcom[ncom-1]);
+        xDelete<char*>(pcom);
 
         return;