Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/modules/VecMergex/VecMergex.cpp

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/VecMergex/VecMergex.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/VecMergex/VecMergex.cpp

@@ -15 +15 @@
         int i;
         int configuration_type;
-        double* uf_serial=NULL;
+        IssmDouble* uf_serial=NULL;
 
         /*retrieve parameters: */
@@ -41 +41 @@
         }
         /*Free ressources:*/
-        xfree((void**)&uf_serial);
+        xDelete<IssmDouble>(uf_serial);
 
         /*Assemble vector: */