[MOAB-dev] r1174 - in MOAB/trunk/tools/iMesh/SIDL: . Cclient Fclient mserver
tautges at mcs.anl.gov
tautges at mcs.anl.gov
Thu Jun 28 21:33:30 CDT 2007
Author: tautges
Date: 2007-06-28 21:33:30 -0500 (Thu, 28 Jun 2007)
New Revision: 1174
Modified:
MOAB/trunk/tools/iMesh/SIDL/Cclient/Makefile.am
MOAB/trunk/tools/iMesh/SIDL/Fclient/Makefile.am
MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in
MOAB/trunk/tools/iMesh/SIDL/iMesh.sidl
MOAB/trunk/tools/iMesh/SIDL/iMesh_SIDL.sidl
MOAB/trunk/tools/iMesh/SIDL/mserver/Makefile.am
MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.cc
MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.hh
MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc
MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh
Log:
- Adding factory method back into SIDL implementation of iMesh
- changing generated files in Makefile.am's for Cclient, Fclient
(Jason, I wonder if we're using different versions of Babel which
are generating files w/ different names...)
- switching the order of libraries in iMesh_SIDL_LIBS to put -liMesh
after -liMeshserver
Modified: MOAB/trunk/tools/iMesh/SIDL/Cclient/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Cclient/Makefile.am 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/Cclient/Makefile.am 2007-06-29 02:33:30 UTC (rev 1174)
@@ -26,32 +26,74 @@
libiMeshCclient_la_includedir = $(includedir)/SIDL
libiMeshCclient_la_SOURCES = \
- iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
+iBase_Error_Impl.hh iMesh_Factory_Impl.hh \
+ iMesh_SIDL_MeshSidl_Impl.hh iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
iBase_EntTag_IOR.h iBase_EntityType_IOR.h iBase_ErrorActions_IOR.h \
iBase_ErrorType_IOR.h iBase_Error_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h \
iBase_SetRelation_IOR.h iBase_SetTag_IOR.h iBase_StorageOrder_IOR.h \
iBase_TagValueType_IOR.h iBase_Tag_IOR.h iMesh_AdjacencyInfo_IOR.h \
iMesh_ArrMod_IOR.h iMesh_Arr_IOR.h iMesh_EntityTopology_IOR.h \
- iMesh_Entity_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h iMesh_Modify_IOR.h \
- iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h \
- iBase_ArrTag_Stub.c iBase_CreationStatus_Stub.c \
- iBase_EntSet_Stub.c iBase_EntTag_Stub.c iBase_EntityType_Stub.c \
- iBase_ErrorActions_Stub.c iBase_ErrorType_Stub.c iBase_Error_Stub.c \
- iBase_SetBoolOps_Stub.c iBase_SetRelation_Stub.c iBase_SetTag_Stub.c \
- iBase_StorageOrder_Stub.c iBase_TagValueType_Stub.c iBase_Tag_Stub.c \
- iMesh_AdjacencyInfo_Stub.c iMesh_ArrMod_Stub.c iMesh_Arr_Stub.c \
- iMesh_EntityTopology_Stub.c iMesh_Entity_Stub.c iMesh_Mesh_Stub.c \
- iMesh_Modify_Stub.c iMesh_SIDL_MeshSidl_Stub.c
+ iMesh_Entity_IOR.h iMesh_Factory_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h \
+ iMesh_Modify_IOR.h iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h iBase.hh iBase_ArrTag.hh iBase_CreationStatus.hh iBase_EntSet.hh \
+ iBase_EntTag.hh iBase_EntityType.hh iBase_Error.hh iBase_ErrorActions.hh \
+ iBase_ErrorType.hh iBase_SetBoolOps.hh iBase_SetRelation.hh iBase_SetTag.hh \
+ iBase_StorageOrder.hh iBase_Tag.hh iBase_TagValueType.hh iMesh.hh \
+ iMesh_AdjacencyInfo.hh iMesh_Arr.hh iMesh_ArrMod.hh iMesh_Entity.hh \
+ iMesh_EntityTopology.hh iMesh_Factory.hh iMesh_Mesh.hh iMesh_Modify.hh \
+ iMesh_SIDL.hh iMesh_SIDL_MeshSidl.hh sidl.hh sidl_BaseClass.hh \
+ sidl_BaseException.hh sidl_BaseInterface.hh sidl_ClassInfo.hh \
+ sidl_ClassInfoI.hh sidl_DFinder.hh sidl_DLL.hh sidl_Finder.hh \
+ sidl_InvViolation.hh sidl_Loader.hh sidl_PostViolation.hh \
+ sidl_PreViolation.hh sidl_Resolve.hh sidl_SIDLException.hh sidl_Scope.hh \
+ sidl_io.hh sidl_io_Deserializer.hh sidl_io_IOException.hh \
+ sidl_io_Serializeable.hh sidl_io_Serializer.hh sidl_rmi.hh \
+ sidl_rmi_ConnectRegistry.hh sidl_rmi_InstanceHandle.hh \
+ sidl_rmi_InstanceRegistry.hh sidl_rmi_Invocation.hh \
+ sidl_rmi_NetworkException.hh sidl_rmi_ProtocolFactory.hh \
+ sidl_rmi_Response.hh \
+\
+iBase_Error_Impl.cc iMesh_Factory_Impl.cc \
+ iMesh_SIDL_MeshSidl_Impl.cc iBase_Error_Skel.cc iMesh_Factory_Skel.cc \
+ iMesh_SIDL_MeshSidl_Skel.cc iBase_ArrTag.cc iBase_EntSet.cc iBase_EntTag.cc iBase_Error.cc \
+ iBase_SetBoolOps.cc iBase_SetRelation.cc iBase_SetTag.cc iBase_Tag.cc \
+ iMesh_Arr.cc iMesh_ArrMod.cc iMesh_Entity.cc iMesh_Factory.cc iMesh_Mesh.cc \
+ iMesh_Modify.cc iMesh_SIDL_MeshSidl.cc sidl_BaseClass.cc \
+ sidl_BaseException.cc sidl_BaseInterface.cc sidl_ClassInfo.cc \
+ sidl_ClassInfoI.cc sidl_DFinder.cc sidl_DLL.cc sidl_Finder.cc \
+ sidl_InvViolation.cc sidl_Loader.cc sidl_PostViolation.cc \
+ sidl_PreViolation.cc sidl_SIDLException.cc sidl_io_Deserializer.cc \
+ sidl_io_IOException.cc sidl_io_Serializeable.cc sidl_io_Serializer.cc \
+ sidl_rmi_ConnectRegistry.cc sidl_rmi_InstanceHandle.cc \
+ sidl_rmi_InstanceRegistry.cc sidl_rmi_Invocation.cc \
+ sidl_rmi_NetworkException.cc sidl_rmi_ProtocolFactory.cc \
+ sidl_rmi_Response.cc
-
libiMeshCclient_la_include_HEADERS = \
- iBase.h iBase_ArrTag.h iBase_CreationStatus.h iBase_EntSet.h \
- iBase_EntTag.h iBase_EntityType.h iBase_Error.h iBase_ErrorActions.h \
- iBase_ErrorType.h iBase_SetBoolOps.h iBase_SetRelation.h iBase_SetTag.h \
- iBase_StorageOrder.h iBase_Tag.h iBase_TagValueType.h iMesh.h \
- iMesh_AdjacencyInfo.h iMesh_Arr.h iMesh_ArrMod.h iMesh_Entity.h \
- iMesh_EntityTopology.h iMesh_Mesh.h iMesh_Modify.h iMesh_SIDL.h \
- iMesh_SIDL_MeshSidl.h
+iBase_Error_Impl.hh iMesh_Factory_Impl.hh \
+ iMesh_SIDL_MeshSidl_Impl.hh iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
+ iBase_EntTag_IOR.h iBase_EntityType_IOR.h iBase_ErrorActions_IOR.h \
+ iBase_ErrorType_IOR.h iBase_Error_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h \
+ iBase_SetRelation_IOR.h iBase_SetTag_IOR.h iBase_StorageOrder_IOR.h \
+ iBase_TagValueType_IOR.h iBase_Tag_IOR.h iMesh_AdjacencyInfo_IOR.h \
+ iMesh_ArrMod_IOR.h iMesh_Arr_IOR.h iMesh_EntityTopology_IOR.h \
+ iMesh_Entity_IOR.h iMesh_Factory_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h \
+ iMesh_Modify_IOR.h iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h iBase.hh iBase_ArrTag.hh iBase_CreationStatus.hh iBase_EntSet.hh \
+ iBase_EntTag.hh iBase_EntityType.hh iBase_Error.hh iBase_ErrorActions.hh \
+ iBase_ErrorType.hh iBase_SetBoolOps.hh iBase_SetRelation.hh iBase_SetTag.hh \
+ iBase_StorageOrder.hh iBase_Tag.hh iBase_TagValueType.hh iMesh.hh \
+ iMesh_AdjacencyInfo.hh iMesh_Arr.hh iMesh_ArrMod.hh iMesh_Entity.hh \
+ iMesh_EntityTopology.hh iMesh_Factory.hh iMesh_Mesh.hh iMesh_Modify.hh \
+ iMesh_SIDL.hh iMesh_SIDL_MeshSidl.hh sidl.hh sidl_BaseClass.hh \
+ sidl_BaseException.hh sidl_BaseInterface.hh sidl_ClassInfo.hh \
+ sidl_ClassInfoI.hh sidl_DFinder.hh sidl_DLL.hh sidl_Finder.hh \
+ sidl_InvViolation.hh sidl_Loader.hh sidl_PostViolation.hh \
+ sidl_PreViolation.hh sidl_Resolve.hh sidl_SIDLException.hh sidl_Scope.hh \
+ sidl_io.hh sidl_io_Deserializer.hh sidl_io_IOException.hh \
+ sidl_io_Serializeable.hh sidl_io_Serializer.hh sidl_rmi.hh \
+ sidl_rmi_ConnectRegistry.hh sidl_rmi_InstanceHandle.hh \
+ sidl_rmi_InstanceRegistry.hh sidl_rmi_Invocation.hh \
+ sidl_rmi_NetworkException.hh sidl_rmi_ProtocolFactory.hh \
+ sidl_rmi_Response.hh
dist-hook:
Modified: MOAB/trunk/tools/iMesh/SIDL/Fclient/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Fclient/Makefile.am 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/Fclient/Makefile.am 2007-06-29 02:33:30 UTC (rev 1174)
@@ -26,43 +26,80 @@
libiMeshF77client_la_includedir = $(includedir)/SIDL
libiMeshF77client_la_SOURCES = \
- iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
+iBase_Error_Impl.hh iMesh_Factory_Impl.hh \
+ iMesh_SIDL_MeshSidl_Impl.hh \
+iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
iBase_EntTag_IOR.h iBase_EntityType_IOR.h iBase_ErrorActions_IOR.h \
iBase_ErrorType_IOR.h iBase_Error_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h \
iBase_SetRelation_IOR.h iBase_SetTag_IOR.h iBase_StorageOrder_IOR.h \
iBase_TagValueType_IOR.h iBase_Tag_IOR.h iMesh_AdjacencyInfo_IOR.h \
iMesh_ArrMod_IOR.h iMesh_Arr_IOR.h iMesh_EntityTopology_IOR.h \
- iMesh_Entity_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h iMesh_Modify_IOR.h \
- iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h \
- iBase_ArrTag_fStub.c iBase_CreationStatus_fStub.c \
- iBase_EntSet_fStub.c iBase_EntTag_fStub.c iBase_EntityType_fStub.c \
- iBase_ErrorActions_fStub.c iBase_ErrorType_fStub.c iBase_Error_fStub.c \
- iBase_SetBoolOps_fStub.c iBase_SetRelation_fStub.c iBase_SetTag_fStub.c \
- iBase_StorageOrder_fStub.c iBase_TagValueType_fStub.c iBase_Tag_fStub.c \
- iMesh_AdjacencyInfo_fStub.c iMesh_ArrMod_fStub.c iMesh_Arr_fStub.c \
- iMesh_EntityTopology_fStub.c iMesh_Entity_fStub.c iMesh_Mesh_fStub.c \
- iMesh_Modify_fStub.c iMesh_SIDL_MeshSidl_fStub.c sidl_BaseClass_fStub.c \
- sidl_BaseException_fStub.c sidl_BaseInterface_fStub.c \
- sidl_ClassInfoI_fStub.c sidl_ClassInfo_fStub.c sidl_DFinder_fStub.c \
- sidl_DLL_fStub.c sidl_Finder_fStub.c sidl_InvViolation_fStub.c \
- sidl_Loader_fStub.c sidl_PostViolation_fStub.c sidl_PreViolation_fStub.c \
- sidl_Resolve_fStub.c sidl_SIDLException_fStub.c sidl_Scope_fStub.c \
- sidl_array_fStub.c sidl_bool_fStub.c sidl_char_fStub.c \
- sidl_dcomplex_fStub.c sidl_double_fStub.c sidl_fcomplex_fStub.c \
- sidl_float_fStub.c sidl_int_fStub.c sidl_io_Deserializer_fStub.c \
- sidl_io_IOException_fStub.c sidl_io_Serializeable_fStub.c \
- sidl_io_Serializer_fStub.c sidl_long_fStub.c sidl_opaque_fStub.c \
- sidl_rmi_ConnectRegistry_fStub.c sidl_rmi_InstanceHandle_fStub.c \
- sidl_rmi_InstanceRegistry_fStub.c sidl_rmi_Invocation_fStub.c \
- sidl_rmi_NetworkException_fStub.c sidl_rmi_ProtocolFactory_fStub.c \
- sidl_rmi_Response_fStub.c sidl_string_fStub.c
+ iMesh_Entity_IOR.h iMesh_Factory_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h \
+ iMesh_Modify_IOR.h iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h \
+iBase.hh iBase_ArrTag.hh iBase_CreationStatus.hh iBase_EntSet.hh \
+ iBase_EntTag.hh iBase_EntityType.hh iBase_Error.hh iBase_ErrorActions.hh \
+ iBase_ErrorType.hh iBase_SetBoolOps.hh iBase_SetRelation.hh iBase_SetTag.hh \
+ iBase_StorageOrder.hh iBase_Tag.hh iBase_TagValueType.hh iMesh.hh \
+ iMesh_AdjacencyInfo.hh iMesh_Arr.hh iMesh_ArrMod.hh iMesh_Entity.hh \
+ iMesh_EntityTopology.hh iMesh_Factory.hh iMesh_Mesh.hh iMesh_Modify.hh \
+ iMesh_SIDL.hh iMesh_SIDL_MeshSidl.hh sidl.hh sidl_BaseClass.hh \
+ sidl_BaseException.hh sidl_BaseInterface.hh sidl_ClassInfo.hh \
+ sidl_ClassInfoI.hh sidl_DFinder.hh sidl_DLL.hh sidl_Finder.hh \
+ sidl_InvViolation.hh sidl_Loader.hh sidl_PostViolation.hh \
+ sidl_PreViolation.hh sidl_Resolve.hh sidl_SIDLException.hh sidl_Scope.hh \
+ sidl_io.hh sidl_io_Deserializer.hh sidl_io_IOException.hh \
+ sidl_io_Serializeable.hh sidl_io_Serializer.hh sidl_rmi.hh \
+ sidl_rmi_ConnectRegistry.hh sidl_rmi_InstanceHandle.hh \
+ sidl_rmi_InstanceRegistry.hh sidl_rmi_Invocation.hh \
+ sidl_rmi_NetworkException.hh sidl_rmi_ProtocolFactory.hh \
+ sidl_rmi_Response.hh \
+ iBase_Error_Impl.cc iMesh_Factory_Impl.cc \
+ iMesh_SIDL_MeshSidl_Impl.cc \
+ iBase_Error_IOR.c iMesh_Factory_IOR.c iMesh_SIDL_MeshSidl_IOR.c \
+ iBase_Error_Skel.cc iMesh_Factory_Skel.cc \
+ iMesh_SIDL_MeshSidl_Skel.cc \
+ iBase_ArrTag.cc iBase_EntSet.cc iBase_EntTag.cc iBase_Error.cc \
+ iBase_SetBoolOps.cc iBase_SetRelation.cc iBase_SetTag.cc iBase_Tag.cc \
+ iMesh_Arr.cc iMesh_ArrMod.cc iMesh_Entity.cc iMesh_Factory.cc iMesh_Mesh.cc \
+ iMesh_Modify.cc iMesh_SIDL_MeshSidl.cc sidl_BaseClass.cc \
+ sidl_BaseException.cc sidl_BaseInterface.cc sidl_ClassInfo.cc \
+ sidl_ClassInfoI.cc sidl_DFinder.cc sidl_DLL.cc sidl_Finder.cc \
+ sidl_InvViolation.cc sidl_Loader.cc sidl_PostViolation.cc \
+ sidl_PreViolation.cc sidl_SIDLException.cc sidl_io_Deserializer.cc \
+ sidl_io_IOException.cc sidl_io_Serializeable.cc sidl_io_Serializer.cc \
+ sidl_rmi_ConnectRegistry.cc sidl_rmi_InstanceHandle.cc \
+ sidl_rmi_InstanceRegistry.cc sidl_rmi_Invocation.cc \
+ sidl_rmi_NetworkException.cc sidl_rmi_ProtocolFactory.cc \
+ sidl_rmi_Response.cc
-
libiMeshF77client_la_include_HEADERS = \
- iBase_CreationStatus.inc iBase_EntityType.inc \
- iBase_ErrorActions.inc iBase_ErrorType.inc iBase_StorageOrder.inc \
- iBase_TagValueType.inc iMesh_AdjacencyInfo.inc iMesh_EntityTopology.inc \
- sidl_Resolve.inc sidl_Scope.inc
+iBase_Error_Impl.hh iMesh_Factory_Impl.hh \
+ iMesh_SIDL_MeshSidl_Impl.hh \
+iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
+ iBase_EntTag_IOR.h iBase_EntityType_IOR.h iBase_ErrorActions_IOR.h \
+ iBase_ErrorType_IOR.h iBase_Error_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h \
+ iBase_SetRelation_IOR.h iBase_SetTag_IOR.h iBase_StorageOrder_IOR.h \
+ iBase_TagValueType_IOR.h iBase_Tag_IOR.h iMesh_AdjacencyInfo_IOR.h \
+ iMesh_ArrMod_IOR.h iMesh_Arr_IOR.h iMesh_EntityTopology_IOR.h \
+ iMesh_Entity_IOR.h iMesh_Factory_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h \
+ iMesh_Modify_IOR.h iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h \
+iBase.hh iBase_ArrTag.hh iBase_CreationStatus.hh iBase_EntSet.hh \
+ iBase_EntTag.hh iBase_EntityType.hh iBase_Error.hh iBase_ErrorActions.hh \
+ iBase_ErrorType.hh iBase_SetBoolOps.hh iBase_SetRelation.hh iBase_SetTag.hh \
+ iBase_StorageOrder.hh iBase_Tag.hh iBase_TagValueType.hh iMesh.hh \
+ iMesh_AdjacencyInfo.hh iMesh_Arr.hh iMesh_ArrMod.hh iMesh_Entity.hh \
+ iMesh_EntityTopology.hh iMesh_Factory.hh iMesh_Mesh.hh iMesh_Modify.hh \
+ iMesh_SIDL.hh iMesh_SIDL_MeshSidl.hh sidl.hh sidl_BaseClass.hh \
+ sidl_BaseException.hh sidl_BaseInterface.hh sidl_ClassInfo.hh \
+ sidl_ClassInfoI.hh sidl_DFinder.hh sidl_DLL.hh sidl_Finder.hh \
+ sidl_InvViolation.hh sidl_Loader.hh sidl_PostViolation.hh \
+ sidl_PreViolation.hh sidl_Resolve.hh sidl_SIDLException.hh sidl_Scope.hh \
+ sidl_io.hh sidl_io_Deserializer.hh sidl_io_IOException.hh \
+ sidl_io_Serializeable.hh sidl_io_Serializer.hh sidl_rmi.hh \
+ sidl_rmi_ConnectRegistry.hh sidl_rmi_InstanceHandle.hh \
+ sidl_rmi_InstanceRegistry.hh sidl_rmi_Invocation.hh \
+ sidl_rmi_NetworkException.hh sidl_rmi_ProtocolFactory.hh \
+ sidl_rmi_Response.hh
dist-hook:
for i in $(BUILT_SOURCES); do $(RM) $(distdir)/$$i; done
Modified: MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in 2007-06-29 02:33:30 UTC (rev 1174)
@@ -18,6 +18,6 @@
-L at abs_builddir@/Fclient/.libs
iMesh_SIDL_LIBS = -L at BABEL_DIR@/lib $(iMesh_SIDL_LDFLAGS) $(iMesh_SIDL_libs) \
- -liMesh -liMeshserver -lsidl -lMOAB @LIBS@
+ -liMeshserver -lsidl -liMesh -lMOAB @LIBS@
iMesh_SIDL_FILES = @abs_builddir@/libiMeshserver.la
Modified: MOAB/trunk/tools/iMesh/SIDL/iMesh.sidl
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iMesh.sidl 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/iMesh.sidl 2007-06-29 02:33:30 UTC (rev 1174)
@@ -280,4 +280,8 @@
in int entity_handles_size) throws iBase.Error;
};
+ class Factory {
+ static void newMesh(in string option, out Mesh new_mesh) throws iBase.Error;
+ };
+
} // END iMesh
Modified: MOAB/trunk/tools/iMesh/SIDL/iMesh_SIDL.sidl
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iMesh_SIDL.sidl 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/iMesh_SIDL.sidl 2007-06-29 02:33:30 UTC (rev 1174)
@@ -12,9 +12,7 @@
iMesh.Arr,
iMesh.Modify,
iMesh.ArrMod
- {
- static void newMesh(in string option, out Mesh new_mesh) throws iBase.Error;
- };
+ {};
} // END iMesh_MOAB
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/Makefile.am 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/Makefile.am 2007-06-29 02:33:30 UTC (rev 1174)
@@ -1,4 +1,4 @@
-INCLUDES += -I at BABEL_DIR@/include
+INCLUDES += -I at BABEL_DIR@/include -I$(srcdir)/..
BUILT_SOURCES = $(libiMeshserver_la_SOURCES) $(libiMeshserver_la_include_HEADERS)
@@ -25,8 +25,8 @@
libiMeshserver_la_includedir = $(includedir)/SIDL
libiMeshserver_la_SOURCES = \
- iBase_Error_Impl.hh iMesh_SIDL_MeshSidl_Impl.hh \
- iBase_Error_Impl.cc iMesh_SIDL_MeshSidl_Impl.cc \
+ iBase_Error_Impl.hh iMesh_SIDL_MeshSidl_Impl.hh iMesh_Factory_Impl.hh \
+ iBase_Error_Impl.cc iMesh_SIDL_MeshSidl_Impl.cc iMesh_Factory_Impl.cc \
iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
iBase_EntTag_IOR.h iBase_EntityType_IOR.h iBase_ErrorActions_IOR.h \
iBase_ErrorType_IOR.h iBase_Error_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h \
@@ -35,12 +35,12 @@
iMesh_ArrMod_IOR.h iMesh_Arr_IOR.h iMesh_EntityTopology_IOR.h \
iMesh_Entity_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h iMesh_Modify_IOR.h \
iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h \
- iBase_Error_IOR.c iMesh_SIDL_MeshSidl_IOR.c \
- iBase_Error_Skel.cc iMesh_SIDL_MeshSidl_Skel.cc \
+ iBase_Error_IOR.c iMesh_SIDL_MeshSidl_IOR.c iMesh_Factory_IOR.c \
+ iBase_Error_Skel.cc iMesh_SIDL_MeshSidl_Skel.cc iMesh_Factory_Skel.cc \
iBase_ArrTag.cc iBase_EntSet.cc iBase_EntTag.cc iBase_Error.cc \
iBase_SetBoolOps.cc iBase_SetRelation.cc iBase_SetTag.cc iBase_Tag.cc \
iMesh_Arr.cc iMesh_ArrMod.cc iMesh_Entity.cc iMesh_Mesh.cc iMesh_Modify.cc \
- iMesh_SIDL_MeshSidl.cc sidl_BaseClass.cc sidl_BaseException.cc \
+ iMesh_SIDL_MeshSidl.cc iMesh_Factory.cc sidl_BaseClass.cc sidl_BaseException.cc \
sidl_BaseInterface.cc sidl_ClassInfo.cc sidl_ClassInfoI.cc sidl_DFinder.cc \
sidl_DLL.cc sidl_Finder.cc sidl_InvViolation.cc sidl_Loader.cc \
sidl_PostViolation.cc sidl_PreViolation.cc sidl_SIDLException.cc \
@@ -69,8 +69,9 @@
sidl_rmi_Response.hh
my_dist_sources = \
- iBase_Error_Impl.hh iMesh_SIDL_MeshSidl_Impl.hh \
- iBase_Error_Impl.cc iMesh_SIDL_MeshSidl_Impl.cc
+ iBase_Error_Impl.hh iMesh_SIDL_MeshSidl_Impl.hh iMesh_Factory_Impl.hh \
+ iBase_Error_Impl.cc iMesh_SIDL_MeshSidl_Impl.cc iMesh_Factory_Impl.cc
+
dist-hook:
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.cc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.cc 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.cc 2007-06-29 02:33:30 UTC (rev 1174)
@@ -3,16 +3,15 @@
// Symbol: iBase.Error-v0.7
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070624 16:06:51 CDT
-// Generated: 20070624 16:07:38 CDT
+// sidl Created: 20070628 20:55:23 CDT
+// Generated: 20070628 20:55:31 CDT
// Description: Server-side implementation for iBase.Error
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.12
// source-line = 84
-// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/iBase.sidl
-// xml-url = /home/tautges/MOAB/tools/iMesh/SIDL/repo/iBase.Error-v0.7.xml
+// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/mserver/../iBase.sidl
//
#include "iBase_Error_Impl.hh"
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.hh
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.hh 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iBase_Error_Impl.hh 2007-06-29 02:33:30 UTC (rev 1174)
@@ -3,16 +3,15 @@
// Symbol: iBase.Error-v0.7
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070624 16:06:51 CDT
-// Generated: 20070624 16:07:38 CDT
+// sidl Created: 20070628 20:55:23 CDT
+// Generated: 20070628 20:55:31 CDT
// Description: Server-side implementation for iBase.Error
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.12
// source-line = 84
-// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/iBase.sidl
-// xml-url = /home/tautges/MOAB/tools/iMesh/SIDL/repo/iBase.Error-v0.7.xml
+// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/mserver/../iBase.sidl
//
#ifndef included_iBase_Error_Impl_hh
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.cc 2007-06-29 02:33:30 UTC (rev 1174)
@@ -2,16 +2,16 @@
// File: iMesh_SIDL_MeshSidl_Impl.cc
// Symbol: iMesh_SIDL.MeshSidl-v0.2
// Symbol Type: class
-// Babel Version: 0.10.10
-// sidl Created: 20070628 12:47:40 CDT
-// Generated: 20070628 12:47:42 CDT
+// Babel Version: 0.10.12
+// sidl Created: 20070628 20:55:25 CDT
+// Generated: 20070628 20:55:32 CDT
// Description: Server-side implementation for iMesh_SIDL.MeshSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
-// babel-version = 0.10.10
+// babel-version = 0.10.12
// source-line = 5
-// source-url = file:/home/jason/moab/tmp/tools/iMesh/SIDL/iMesh_SIDL.sidl
+// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/mserver/../iMesh_SIDL.sidl
//
#include "iMesh_SIDL_MeshSidl_Impl.hh"
@@ -69,36 +69,8 @@
// DO-NOT-DELETE splicer.end(iMesh_SIDL.MeshSidl._load)
}
-// user-defined static methods:
-/**
- * Method: newMesh[]
- */
-void
-iMesh_SIDL::MeshSidl_impl::newMesh (
- /* in */ const ::std::string& option,
- /* out */ ::iMesh::Mesh& new_mesh )
-throw (
- ::iBase::Error
-){
- // DO-NOT-DELETE splicer.begin(iMesh_SIDL.MeshSidl.newMesh)
- // Insert-Code-Here {iMesh_SIDL.MeshSidl.newMesh} (newMesh method)
+// user-defined static methods: (none)
- // first create a C-binding instance
- int ierr;
- iMesh_newMesh(option.c_str(), &iMesh_SIDL::MeshSidl_impl::imeshInstance,
- &ierr, option.length());
- if (iBase_SUCCESS != ierr) {
- iBase::Error this_error = iBase::Error::_create();
- this_error.set((iBase::ErrorType)ierr, "Couldn't create new iMesh instance.");
- throw this_error;
- }
-
- // then create and return the sidl mesh
- new_mesh = ::iMesh_SIDL::MeshSidl::_create();
- // DO-NOT-DELETE splicer.end(iMesh_SIDL.MeshSidl.newMesh)
-}
-
-
// user-defined non-static methods:
/**
* Method: createTag[]
Modified: MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh 2007-06-28 23:47:51 UTC (rev 1173)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/iMesh_SIDL_MeshSidl_Impl.hh 2007-06-29 02:33:30 UTC (rev 1174)
@@ -3,15 +3,15 @@
// Symbol: iMesh_SIDL.MeshSidl-v0.2
// Symbol Type: class
// Babel Version: 0.10.12
-// sidl Created: 20070624 16:07:30 CDT
-// Generated: 20070624 16:07:38 CDT
+// sidl Created: 20070628 20:55:25 CDT
+// Generated: 20070628 20:55:32 CDT
// Description: Server-side implementation for iMesh_SIDL.MeshSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.12
// source-line = 5
-// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/iMesh_SIDL.sidl
+// source-url = file:/home/tautges/MOAB/tools/iMesh/SIDL/mserver/../iMesh_SIDL.sidl
//
#ifndef included_iMesh_SIDL_MeshSidl_Impl_hh
@@ -47,9 +47,6 @@
#ifndef included_iMesh_EntityTopology_hh
#include "iMesh_EntityTopology.hh"
#endif
-#ifndef included_iMesh_Mesh_hh
-#include "iMesh_Mesh.hh"
-#endif
#ifndef included_iMesh_SIDL_MeshSidl_hh
#include "iMesh_SIDL_MeshSidl.hh"
#endif
@@ -63,6 +60,7 @@
// DO-NOT-DELETE splicer.begin(iMesh_SIDL.MeshSidl._includes)
// Insert-Code-Here {iMesh_SIDL.MeshSidl._includes} (includes or arbitrary code)
+#include "iMesh_Factory_Impl.hh"
#include "iMesh.h"
// DO-NOT-DELETE splicer.end(iMesh_SIDL.MeshSidl._includes)
@@ -84,6 +82,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;
int imeshError;
void processError() throw(::iBase::Error);
@@ -115,19 +114,7 @@
static void _load();
public:
- /**
- * user defined static method.
- */
- static void
- newMesh (
- /* in */ const ::std::string& option,
- /* out */ ::iMesh::Mesh& new_mesh
- )
- throw (
- ::iBase::Error
- );
-
/**
* user defined non-static method.
*/
More information about the moab-dev
mailing list