[MOAB-dev] r1236 - MOAB/trunk/tools/iMesh/SIDL/mserver

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2007-08-16 12:01:02 -0500 (Thu, 16 Aug 2007)
New Revision: 1236

Modified:
   MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc
   MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh
Log:
o Make iMesh_Instance non-static: each instance of the MOAB SIDL iMesh 
  object should have it's own iMesh_Instance.  Previous code was quite
  inconsistant in that all SIDL iMesh objects shared a single iMesh_Instance,
  but each tried to delete that instance in their dtor() method.
o Provide a working implementation of the SIDL iMesh::ctor() method that
  calls iMesh_newMesh.



Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc	2007-08-16 16:17:02 UTC (rev 1235)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc	2007-08-16 17:01:02 UTC (rev 1236)
@@ -41,14 +41,13 @@
 #include "iBase_SIDL_defs.h"
 #include <iostream>
 
-iMesh_Instance iMesh_SIDL::MeshSidl_impl::imeshInstance = 0;
-
 // DO-NOT-DELETE splicer.end(iMesh_SIDL.MeshSidl._includes)
 
 // user-defined constructor.
 void iMesh_SIDL::MeshSidl_impl::_ctor() {
   // DO-NOT-DELETE splicer.begin(iMesh_SIDL.MeshSidl._ctor)
-  // Insert-Code-Here {iMesh_SIDL.MeshSidl._ctor} (constructor)
+  iMesh_newMesh( 0, &imeshInstance, &imeshError, 0 );
+  PROCESS_ERROR;
   // DO-NOT-DELETE splicer.end(iMesh_SIDL.MeshSidl._ctor)
 }
 

Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh	2007-08-16 16:17:02 UTC (rev 1235)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh	2007-08-16 17:01:02 UTC (rev 1236)
@@ -83,7 +83,7 @@
     // DO-NOT-DELETE splicer.begin(iMesh_SIDL.MeshSidl._implementation)
     // Insert-Code-Here {iMesh_SIDL.MeshSidl._implementation} (additional details)
     friend class iMesh::Factory_impl;
-    static iMesh_Instance imeshInstance;
+    iMesh_Instance imeshInstance;
     int imeshError;
     void processError() throw(::iBase::Error);