Changeset 11693

Timestamp:

03/13/12 19:26:32 (13 years ago)

Author:

Eric.Larour

Message:

Do not delete Matrix and Object. Matlab API bug

File:

• issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/Alloc/alloc.cpp

@@ -81 +81 @@
 
 void xdelete(Matrix** pv){
+        
         if (pv && *pv){
+                #ifdef _HAVE_PARALLEL_ 
+                /*There is no mxDelete in the Matlab API -> using delete trips up Matlab. So we 
+                 * don't actually free memory in Matlab, we let the memory manager do that. We only
+                 * free in parallel: */
                 delete *pv;
+                #endif
                 *pv=NULL;
         }
@@ -88 +94 @@
 
 void xdelete(Vector** pv){
+
         if (pv && *pv){
-                //delete *pv;
-                VecFree(&(*pv)->vector);
+                #ifdef _HAVE_PARALLEL_ 
+                /*There is no mxDelete in the Matlab API -> using delete trips up Matlab. So we 
+                 * don't actually free memory in Matlab, we let the memory manager do that. We only
+                 * free in parallel: */
+                delete *pv;
+                #endif
                 *pv=NULL;
         }