Changeset 12852

Timestamp:

08/01/12 15:24:50 (13 years ago)

Author:

Eric.Larour

Message:

BUG: reverting to previous memory managenet in xdelete_module. This is
a bug due to Matlab C++ memory management deficiencies (to say the least).

File:

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

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

@@ -22 +22 @@
                 /*Actually, still get rid of internal Petsc matrix. Quick fix until Matlab handles C++ 
                  * correctly: */
-                /*Keeping this for legacy reasons: */
-                /*#ifdef _HAVE_PETSC_
-                        MatFree(&(*pv)->matrix);
-                #endif*/
-                delete *pv;
+                #ifdef _HAVE_PETSC_
+                        MatFree(&(*pv)->pmatrix->matrix);
+                #endif
                 *pv=NULL;
         }
@@ -36 +34 @@
                 /*Actually, still get rid of internal Petsc vector. Quick fix until Matlab handles C++ 
                  * correctly: */
-                /*Keeping this for legacy reasons: shoudl be done by the vector itself!*/
-                /*#ifdef _HAVE_PETSC_
-                        VecFree(&(*pv)->vector);
-                #endif*/
-                delete *pv;
+                #ifdef _HAVE_PETSC_
+                        VecFree(&(*pv)->pvector->vector);
+                #endif
                 *pv=NULL;
         }