[Ecell-cvs] SF.net SVN: ecell:[3291] ecell3/branches/ecell-3.1/dmtool

[<mor...@us...>]

Revision: 3291
          http://ecell.svn.sourceforge.net/ecell/?rev=3291&view=rev
Author:   moriyoshi
Date:     2008-11-19 00:35:35 +0000 (Wed, 19 Nov 2008)

Log Message:
-----------
* Forgot to commit these.

Modified Paths:
--------------
    ecell3/branches/ecell-3.1/dmtool/DMObject.hpp
    ecell3/branches/ecell-3.1/dmtool/DynamicModule.hpp
    ecell3/branches/ecell-3.1/dmtool/DynamicModuleDescriptor.hpp

Modified: ecell3/branches/ecell-3.1/dmtool/DMObject.hpp
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/DMObject.hpp	2008-11-18 15:33:43 UTC (rev 3290)
+++ ecell3/branches/ecell-3.1/dmtool/DMObject.hpp	2008-11-19 00:35:35 UTC (rev 3291)
@@ -46,6 +46,7 @@
         &CLASSNAME::createInstance, \
         &CLASSNAME::getClassInfoPtr, \
         &CLASSNAME::initializeModule, \
+        &CLASSNAME::finalizeModule \
     }
 
 #define DM_INIT( CLASSNAME )\
@@ -69,4 +70,5 @@
  typedef CLASSNAME * (* AllocatorFuncPtr )()
 
 
-#endif /* __DMOBJECT_HPP */
\ No newline at end of file
+#endif /* __DMOBJECT_HPP */
+

Modified: ecell3/branches/ecell-3.1/dmtool/DynamicModule.hpp
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/DynamicModule.hpp	2008-11-18 15:33:43 UTC (rev 3290)
+++ ecell3/branches/ecell-3.1/dmtool/DynamicModule.hpp	2008-11-19 00:35:35 UTC (rev 3291)
@@ -75,8 +75,9 @@
 
     ~DynamicModule()
     {
+        theDescriptor.moduleFinalizer();
         if ( theFinalizer )
-            (this->*theFinalizer)();
+            ( this->*theFinalizer )();
     }
 
     const DynamicModuleDescriptor& getDescriptor()

Modified: ecell3/branches/ecell-3.1/dmtool/DynamicModuleDescriptor.hpp
===================================================================
--- ecell3/branches/ecell-3.1/dmtool/DynamicModuleDescriptor.hpp	2008-11-18 15:33:43 UTC (rev 3290)
+++ ecell3/branches/ecell-3.1/dmtool/DynamicModuleDescriptor.hpp	2008-11-19 00:35:35 UTC (rev 3291)
@@ -39,11 +39,13 @@
     typedef void* (*AllocatorType)();
     typedef const DynamicModuleInfo* (*InfoLoaderType)();
     typedef void (*ModuleInitializerType)();
+    typedef void (*ModuleFinalizerType)();
 
     const char* moduleName;
     AllocatorType allocator;
     InfoLoaderType infoLoader;
     ModuleInitializerType moduleInitializer;
+    ModuleFinalizerType moduleFinalizer;
 };
 
 #endif /* __DYNAMIC_MODULE_DESCRIPTOR_HPP */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.