Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp (revision 12861) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.cpp (revision 12862) @@ -1,41 +0,0 @@ -/* \file alloc_module.h - */ - - -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile without HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include -#include - -#include "./alloc_module.h" -#include "../Exceptions/exceptions.h" -#include "../../include/include.h" -#include "../../classes/objects/objects.h" - -void xdelete_module(Matrix** pv){ - - if (pv && *pv){ - /*Actually, still get rid of internal Petsc matrix. Quick fix until Matlab handles C++ - * correctly: */ - #ifdef _HAVE_PETSC_ - MatFree(&(*pv)->pmatrix->matrix); - #endif - *pv=NULL; - } -} - -void xdelete_module(Vector** pv){ - - if (pv && *pv){ - /*Actually, still get rid of internal Petsc vector. Quick fix until Matlab handles C++ - * correctly: */ - #ifdef _HAVE_PETSC_ - VecFree(&(*pv)->pvector->vector); - #endif - *pv=NULL; - } -} Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.h (revision 12861) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/Alloc/alloc_module.h (revision 12862) @@ -1,11 +0,0 @@ -/* \file alloc.h - */ - -#ifndef _ALLOC_MODULE_H_ -#define _ALLOC_MODULE_H_ -class Matrix; -class Vector; -void xdelete_module(Matrix** pvptr); -void xdelete_module(Vector** pvptr); - -#endif Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12861) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/shared/shared.h (revision 12862) @@ -6,7 +6,6 @@ #define _SHARED_H_ #include "Alloc/alloc.h" -#include "Alloc/alloc_module.h" #include "Alloc/xNewDelete.h" #include "Bamg/shared.h" #include "Elements/elements.h" Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12861) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/c/Makefile.am (revision 12862) @@ -838,9 +838,7 @@ #}}} #Modules sources{{{ -module_sources= ./shared/Alloc/alloc_module.h\ - ./shared/Alloc/alloc_module.cpp\ - ./shared/Threads/issm_threads.h\ +module_sources= ./shared/Threads/issm_threads.h\ ./shared/Threads/LaunchThread.cpp\ ./shared/Threads/PartitionRange.cpp\ ./shared/Exp/exp.h\