[cgma-dev] r2579 - in cgm/trunk/itaps: . SIDL/bserver SIDL/gserver
kraftche at mcs.anl.gov
kraftche at mcs.anl.gov
Mon Jan 26 14:20:19 CST 2009
Author: kraftche
Date: 2009-01-26 14:20:19 -0600 (Mon, 26 Jan 2009)
New Revision: 2579
Modified:
cgm/trunk/itaps/SIDL/bserver/iBase_Error_Impl.cc
cgm/trunk/itaps/SIDL/bserver/iBase_Error_Impl.hh
cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.cc
cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.hh
cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.hh
cgm/trunk/itaps/iBase.h
Log:
Leave iBase_Instance as void* so any interface type can be passed
Modified: cgm/trunk/itaps/SIDL/bserver/iBase_Error_Impl.cc
===================================================================
--- cgm/trunk/itaps/SIDL/bserver/iBase_Error_Impl.cc 2009-01-26 20:19:00 UTC (rev 2578)
+++ cgm/trunk/itaps/SIDL/bserver/iBase_Error_Impl.cc 2009-01-26 20:20:19 UTC (rev 2579)
@@ -1,17 +1,17 @@
//
// File: iBase_Error_Impl.cc
-// Symbol: iBase.Error-v0.7
+// Symbol: iBase.Error-v0.8
// Symbol Type: class
-// Babel Version: 0.10.12
-// sidl Created: 20070626 21:46:00 CDT
-// Generated: 20070626 21:46:06 CDT
+// Babel Version: 0.10.10
+// sidl Created: 20090126 13:05:20 CST
+// Generated: 20090126 13:05:22 CST
// Description: Server-side implementation for iBase.Error
//
// WARNING: Automatically generated; only changes within splicers preserved
//
-// babel-version = 0.10.12
-// source-line = 73
-// source-url = file:/home/tautges/CGMnew/itaps/SIDL/iBase.sidl
+// babel-version = 0.10.10
+// source-line = 84
+// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iBase.sidl
//
#include "iBase_Error_Impl.hh"
Modified: cgm/trunk/itaps/SIDL/bserver/iBase_Error_Impl.hh
===================================================================
--- cgm/trunk/itaps/SIDL/bserver/iBase_Error_Impl.hh 2009-01-26 20:19:00 UTC (rev 2578)
+++ cgm/trunk/itaps/SIDL/bserver/iBase_Error_Impl.hh 2009-01-26 20:20:19 UTC (rev 2579)
@@ -1,17 +1,17 @@
//
// File: iBase_Error_Impl.hh
-// Symbol: iBase.Error-v0.7
+// Symbol: iBase.Error-v0.8
// Symbol Type: class
-// Babel Version: 0.10.12
-// sidl Created: 20070626 21:46:00 CDT
-// Generated: 20070626 21:46:06 CDT
+// Babel Version: 0.10.10
+// sidl Created: 20090126 13:05:20 CST
+// Generated: 20090126 13:05:22 CST
// Description: Server-side implementation for iBase.Error
//
// WARNING: Automatically generated; only changes within splicers preserved
//
-// babel-version = 0.10.12
-// source-line = 73
-// source-url = file:/home/tautges/CGMnew/itaps/SIDL/iBase.sidl
+// babel-version = 0.10.10
+// source-line = 84
+// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iBase.sidl
//
#ifndef included_iBase_Error_Impl_hh
@@ -47,7 +47,7 @@
namespace iBase {
/**
- * Symbol "iBase.Error" (version 0.7)
+ * Symbol "iBase.Error" (version 0.8)
*/
class Error_impl
// DO-NOT-DELETE splicer.begin(iBase.Error._inherits)
Modified: cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.cc
===================================================================
--- cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.cc 2009-01-26 20:19:00 UTC (rev 2578)
+++ cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.cc 2009-01-26 20:20:19 UTC (rev 2579)
@@ -2,17 +2,17 @@
// File: iGeom_Factory_Impl.cc
// Symbol: iGeom.Factory-v0.6.99
// Symbol Type: class
-// Babel Version: 0.10.12
-// sidl Created: 20070626 21:46:15 CDT
-// Generated: 20070626 21:46:35 CDT
+// Babel Version: 0.10.10
+// sidl Created: 20090126 13:05:55 CST
+// Generated: 20090126 13:13:26 CST
// Description: Server-side implementation for iGeom.Factory
//
// WARNING: Automatically generated; only changes within splicers preserved
//
-// babel-version = 0.10.12
-// source-line = 1109
-// source-url = file:/home/tautges/CGMnew/itaps/SIDL/iGeom.sidl
-// xml-url = /home/tautges/CGMnew/itaps/SIDL/repo/iGeom.Factory-v0.6.99.xml
+// babel-version = 0.10.10
+// source-line = 1115
+// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iGeom.sidl
+// xml-url = /home/jason/meshkit/cgm/itaps/SIDL/repo/iGeom.Factory-v0.6.99.xml
//
#include "iGeom_Factory_Impl.hh"
Modified: cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.hh
===================================================================
--- cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.hh 2009-01-26 20:19:00 UTC (rev 2578)
+++ cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.hh 2009-01-26 20:20:19 UTC (rev 2579)
@@ -2,17 +2,17 @@
// File: iGeom_Factory_Impl.hh
// Symbol: iGeom.Factory-v0.6.99
// Symbol Type: class
-// Babel Version: 0.10.12
-// sidl Created: 20070626 21:46:15 CDT
-// Generated: 20070626 21:46:35 CDT
+// Babel Version: 0.10.10
+// sidl Created: 20090126 13:05:55 CST
+// Generated: 20090126 13:13:26 CST
// Description: Server-side implementation for iGeom.Factory
//
// WARNING: Automatically generated; only changes within splicers preserved
//
-// babel-version = 0.10.12
-// source-line = 1109
-// source-url = file:/home/tautges/CGMnew/itaps/SIDL/iGeom.sidl
-// xml-url = /home/tautges/CGMnew/itaps/SIDL/repo/iGeom.Factory-v0.6.99.xml
+// babel-version = 0.10.10
+// source-line = 1115
+// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iGeom.sidl
+// xml-url = /home/jason/meshkit/cgm/itaps/SIDL/repo/iGeom.Factory-v0.6.99.xml
//
#ifndef included_iGeom_Factory_Impl_hh
Modified: cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.hh
===================================================================
--- cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.hh 2009-01-26 20:19:00 UTC (rev 2578)
+++ cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.hh 2009-01-26 20:20:19 UTC (rev 2579)
@@ -2,16 +2,16 @@
// File: iGeom_SIDL_GeomSidl_Impl.hh
// Symbol: iGeom_SIDL.GeomSidl-v0.1
// Symbol Type: class
-// Babel Version: 0.10.12
-// sidl Created: 20070626 21:46:23 CDT
-// Generated: 20070626 21:46:35 CDT
+// Babel Version: 0.10.10
+// sidl Created: 20090126 13:13:24 CST
+// Generated: 20090126 13:13:26 CST
// Description: Server-side implementation for iGeom_SIDL.GeomSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
-// babel-version = 0.10.12
+// babel-version = 0.10.10
// source-line = 5
-// source-url = file:/home/tautges/CGMnew/itaps/SIDL/iGeom_SIDL.sidl
+// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iGeom_SIDL.sidl
//
#ifndef included_iGeom_SIDL_GeomSidl_Impl_hh
@@ -651,7 +651,7 @@
void
addEntToSet (
/* in */ void* entity_handle,
- /* inout */ void*& entity_set
+ /* in */ void* entity_set
)
throw (
::iBase::Error
@@ -663,7 +663,7 @@
void
rmvEntFromSet (
/* in */ void* entity_handle,
- /* inout */ void*& entity_set
+ /* in */ void* entity_set
)
throw (
::iBase::Error
@@ -676,7 +676,7 @@
addEntArrToSet (
/* in */ ::sidl::array<void*> entity_handles,
/* in */ int32_t entity_handles_size,
- /* inout */ void*& entity_set
+ /* in */ void* entity_set
)
throw (
::iBase::Error
@@ -689,7 +689,7 @@
rmvEntArrFromSet (
/* in */ ::sidl::array<void*> entity_handles,
/* in */ int32_t entity_handles_size,
- /* inout */ void*& entity_set
+ /* in */ void* entity_set
)
throw (
::iBase::Error
@@ -701,7 +701,7 @@
void
addEntSet (
/* in */ void* entity_set_to_add,
- /* inout */ void*& entity_set_handle
+ /* in */ void* entity_set_handle
)
throw (
::iBase::Error
@@ -713,7 +713,7 @@
void
rmvEntSet (
/* in */ void* entity_set_to_remove,
- /* inout */ void*& entity_set_handle
+ /* in */ void* entity_set_handle
)
throw (
::iBase::Error
@@ -736,6 +736,20 @@
* user defined non-static method.
*/
void
+ isEntArrContained (
+ /* in */ void* containing_set,
+ /* in */ ::sidl::array<void*> entity_handles,
+ /* in */ int32_t entity_handles_size,
+ /* inout */ ::sidl::array<int32_t>& is_contained,
+ /* out */ int32_t& is_contained_size
+ )
+ throw ()
+ ;
+
+ /**
+ * user defined non-static method.
+ */
+ void
isEntSetContained (
/* in */ void* containing_entity_set,
/* in */ void* contained_entity_set,
@@ -750,8 +764,8 @@
*/
void
addPrntChld (
- /* inout */ void*& parent_entity_set,
- /* inout */ void*& child_entity_set
+ /* in */ void* parent_entity_set,
+ /* in */ void* child_entity_set
)
throw (
::iBase::Error
@@ -762,8 +776,8 @@
*/
void
rmvPrntChld (
- /* inout */ void*& parent_entity_set,
- /* inout */ void*& child_entity_set
+ /* in */ void* parent_entity_set,
+ /* in */ void* child_entity_set
)
throw (
::iBase::Error
@@ -2506,6 +2520,18 @@
* user defined non-static method.
*/
void
+ Sphere (
+ /* in */ double radius,
+ /* out */ void*& geom_entity
+ )
+ throw (
+ ::iBase::Error
+ );
+
+ /**
+ * user defined non-static method.
+ */
+ void
Brick (
/* in */ double x,
/* in */ double y,
Modified: cgm/trunk/itaps/iBase.h
===================================================================
--- cgm/trunk/itaps/iBase.h 2009-01-26 20:19:00 UTC (rev 2578)
+++ cgm/trunk/itaps/iBase.h 2009-01-26 20:20:19 UTC (rev 2579)
@@ -15,7 +15,7 @@
* TYPEDEF'S
*==========================================================
*/
- typedef struct iBase_Instance_Private* iBase_Instance;
+ typedef void* iBase_Instance;
typedef struct iBase_EntityHandle_Private* iBase_EntityHandle;
typedef struct iBase_EntitySetHandle_Private* iBase_EntitySetHandle;
typedef struct iBase_TagHandle_Private* iBase_TagHandle;
More information about the cgma-dev
mailing list