Index: /issm/trunk-jpl/src/modules/Chaco/Chaco.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/Chaco/Chaco.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/Chaco/Chaco.cpp	(revision 13250)
@@ -119,15 +119,15 @@
 
 	/*Free ressources:*/
-	xfree((void**)&assignment); 
-	xfree((void**)&goal);
-	xfree((void**)&nparts);
-	xfree((void**)&z);
-	xfree((void**)&y);
-	xfree((void**)&x);
-	xfree((void**)&ewgts);
-	xfree((void**)&vwgts);
-	xfree((void**)&adjacency);
-	xfree((void**)&start);
-	xfree((void**)&doubleassignment);
+	xDelete<short>(assignment); 
+	xDelete<double>(goal);
+	xDelete<int>(nparts);
+	xDelete<float>(z);
+	xDelete<float>(y);
+	xDelete<float>(x);
+	xDelete<float>(ewgts);
+	xDelete<int>(vwgts);
+	xDelete<int>(adjacency);
+	xDelete<int>(start);
+	xDelete<double>(doubleassignment);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/modules/Exp2Kml/Exp2Kml.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/Exp2Kml/Exp2Kml.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/Exp2Kml/Exp2Kml.cpp	(revision 13250)
@@ -87,8 +87,8 @@
 
 	/*Clean-up*/
-	xfree((void**)&choles);
+	xDelete<char>(choles);
+	xDelete<char>(filkml);
+	xDelete<char>(filexp);
 	delete options;
-	xfree((void**)&filkml);
-	xfree((void**)&filexp);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/modules/InternalFront/InternalFront.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/InternalFront/InternalFront.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/InternalFront/InternalFront.cpp	(revision 13250)
@@ -89,5 +89,5 @@
 		for(i=0;i<4*numberofsegments;i++) front2[i]=(double)front[i];
 	}
-	xfree((void**)&front);
+	xDelete<int>(front);
 
 	/*write output datasets: */
Index: /issm/trunk-jpl/src/modules/KMLFileRead/KMLFileRead.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/KMLFileRead/KMLFileRead.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/KMLFileRead/KMLFileRead.cpp	(revision 13250)
@@ -118,7 +118,7 @@
 
 	/*Clean-up*/
-	xfree((void**)&write);
-	xfree((void**)&deepecho);
-	xfree((void**)&echo);
+	xDelete<char>(write);
+	xDelete<char>(deepecho);
+	xDelete<char>(echo);
 	delete options;
 
Index: /issm/trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/KMLMeshWrite/KMLMeshWrite.cpp	(revision 13250)
@@ -142,5 +142,5 @@
 	/*Clean-up*/
 	delete options;
-	if (mxIsCell(NOTES) && notes) xfree((void**)&notes);
+	if (mxIsCell(NOTES) && notes) xDelete<char>(notes);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/KMLOverlay/KMLOverlay.cpp	(revision 13250)
@@ -112,6 +112,6 @@
 
 		if (mexEvalString(czip)) _error_("Error zipping file \"" << filkmz << "\".");
-		xfree((void**)&czip);
-		xfree((void**)&filkmz);
+		xDelete<char>(czip);
+		xDelete<char>(filkmz);
 	}
 
@@ -121,11 +121,11 @@
 	/*Clean-up*/
 	if (pimages) {
-		for (i=nimages; i>0; i--) xfree((void**)&(pimages[i-1]));
-		xfree((void**)&pimages);
+		for (i=nimages; i>0; i--) xDelete<char>(pimages[i-1]);
+		xDelete<char*>(pimages);
 	}
-	xfree((void**)&longaxis);
-	xfree((void**)&lataxis);
+	xDelete<double>(longaxis);
+	xDelete<double>(lataxis);
+	xDelete<char>(filkml);
 	delete options;
-	xfree((void**)&filkml);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/modules/Kml2Exp/Kml2Exp.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/Kml2Exp/Kml2Exp.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/Kml2Exp/Kml2Exp.cpp	(revision 13250)
@@ -80,7 +80,7 @@
 
 	/*Clean-up*/
+	xDelete<char>(filexp);
+	xDelete<char>(filkml);
 	delete options;
-	xfree((void**)&filexp);
-	xfree((void**)&filkml);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/modules/Kriging/Kriging.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/Kriging/Kriging.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/Kriging/Kriging.cpp	(revision 13250)
@@ -60,11 +60,12 @@
 
 	/*Free ressources: */
-	xfree((void**)&x);
-	xfree((void**)&y);
-	xfree((void**)&observations);
-	xfree((void**)&x_interp);
-	xfree((void**)&y_interp);
-	xfree((void**)&predictions);
-	xfree((void**)&error);
+	xDelete<double>(x);
+	xDelete<double>(y);
+	xDelete<double>(observations);
+	xDelete<double>(x_interp);
+	xDelete<double>(y_interp);
+	xDelete<double>(predictions);
+	xDelete<double>(error);
+	delete options;
 
 	/*end module: */
Index: /issm/trunk-jpl/src/modules/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp	(revision 13250)
@@ -39,6 +39,6 @@
 
 	/*Free ressources: */
-	xfree((void**)&connectivity);
-	xfree((void**)&flags);
+	xDelete<double>(connectivity);
+	xDelete<double>(flags);
 
 	/*end module: */
Index: /issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp
===================================================================
--- /issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp	(revision 13249)
+++ /issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp	(revision 13250)
@@ -92,6 +92,6 @@
 	/*Clean-up*/
 	delete options;
-	xfree((void**)&filkml);
-	xfree((void**)&filshp);
+	xDelete<char>(filkml);
+	xDelete<char>(filshp);
 
 	/*end module: */