Changeset 12452

Timestamp:

06/18/12 15:35:24 (13 years ago)

Author:

Mathieu Morlighem

Message:

changing xmalloc to xNew and xfree to xDelete

Location:

issm/trunk-jpl/src/c/objects/Params

Files:

• DoubleMatParam.cpp (modified) (2 diffs)
• DoubleVecParam.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/objects/Params/DoubleMatParam.cpp

@@ -39 +39 @@
 /*FUNCTION DoubleMatParam::~DoubleMatParam(){{{*/
 DoubleMatParam::~DoubleMatParam(){
-        xfree((void**)&value);
+        xDelete<double>(value);
         return;
 }
@@ -121 +121 @@
 
         /*avoid leak: */
-        xfree((void**)&this->value);
+        xDelete<double>(this->value);
 
         this->value=xNew<double>(in_M*in_N);

issm/trunk-jpl/src/c/objects/Params/DoubleVecParam.cpp

@@ -32 +32 @@
         M=in_M;
 
-        values=(double*)xmalloc(M*sizeof(double));
+        values=xNew<double>(M);
         memcpy(values,in_values,M*sizeof(double));
 }
@@ -38 +38 @@
 /*FUNCTION DoubleVecParam::~DoubleVecParam(){{{*/
 DoubleVecParam::~DoubleVecParam(){
-        xfree((void**)&values);
+        xDelete<double>(values);
         return;
 }
@@ -97 +97 @@
 
         M=this->M;
-        output=(double*)xmalloc(M*sizeof(double));
+        output=xNew<double>(M);
         memcpy(output,values,M*sizeof(double));
 
@@ -113 +113 @@
         N=1;
         M=this->M;
-        output=(double*)xmalloc(M*sizeof(double));
+        output=xNew<double>(M);
         memcpy(output,values,M*sizeof(double));
 
@@ -136 +136 @@
 
         /*avoid leak: */
-        xfree((void**)&this->values);
+        xDelete<double>(this->values);
 
-        this->values=(double*)xmalloc(in_M*sizeof(double));
+        this->values=xNew<double>(in_M);
         memcpy(this->values,doublearray,in_M*sizeof(double));