[MOAB-dev] r2605 - MOAB/trunk/tools/iMesh

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2009-01-30 12:11:39 -0600 (Fri, 30 Jan 2009)
New Revision: 2605

Modified:
   MOAB/trunk/tools/iMesh/iMeshP.h
   MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp
Log:
update iMeshP.h for iBase and iMesh changes

Modified: MOAB/trunk/tools/iMesh/iMeshP.h
===================================================================
--- MOAB/trunk/tools/iMesh/iMeshP.h	2009-01-30 17:25:02 UTC (rev 2604)
+++ MOAB/trunk/tools/iMesh/iMeshP.h	2009-01-30 18:11:39 UTC (rev 2605)
@@ -11,15 +11,12 @@
 #endif
 
 /** Handles needed in iMeshP */
-#define ITAPS_DECLARE_HANDLE( NAME ) typedef struct NAME##DummyStruct *NAME
+typedef struct iMeshP_PartitionHandle_Private* iMeshP_PartitionHandle;
+typedef struct iMeshP_RequestHandle_Private* iMeshP_RequestHandle;
 
-ITAPS_DECLARE_HANDLE( iMeshP_PartitionHandle );
-ITAPS_DECLARE_HANDLE( iMeshP_RequestHandle );
-
 /* Since we allow overloading of iMesh functions' entity set handles with
  * part handles, iMeshP_PartHandle must be defined the same as 
  * iBase_EntitySetHandle. */
-/* ITAPS_DECLARE_HANDLE( iMeshP_PartHandle );*/
 typedef iBase_EntitySetHandle iMeshP_PartHandle;
 
 typedef unsigned iMeshP_Part;
@@ -1243,7 +1240,7 @@
             iMesh_Instance instance,
             const iMeshP_PartitionHandle partition,
             const iMeshP_PartHandle part,
-            const iBase_EntityHandle entity_set,
+            const iBase_EntitySetHandle entity_set,
             int entity_type_requestor,
             int entity_topology_requestor,
             int entity_type_requested,

Modified: MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp	2009-01-30 17:25:02 UTC (rev 2604)
+++ MOAB/trunk/tools/iMesh/iMeshP_MOAB.cpp	2009-01-30 18:11:39 UTC (rev 2605)
@@ -114,7 +114,7 @@
 
 DECLARE_ALLOWED_ITAPS_SET_CONVERSION( iMeshP_PartitionHandle )
 //DECLARE_ALLOWED_ITAPS_SET_CONVERSION( iMeshP_PartHandle )
-//DECLARE_ALLOWED_ITAPS_SET_CONVERSION( iBase_EntitySetHandle )
+DECLARE_ALLOWED_ITAPS_SET_CONVERSION( iBase_EntitySetHandle )
 DECLARE_ALLOWED_ITAPS_CONVERSION( iBase_EntityHandle )
 
 
@@ -787,7 +787,7 @@
                                     const int entity_topology,
                                     const int array_size,
                                     const iMeshP_Part nbor_part_id,
-                                    iMesh_EntityIterator* entity_iterator,
+                                    iMesh_EntityArrIterator* entity_iterator,
                                     int* err )
 {
   MBRange entities;
@@ -797,7 +797,7 @@
                                             entity_topology,
                                             nbor_part_id,
                                             entities ); CHKERR(rval);
-  *entity_iterator = create_itaps_iterator( entities, array_size );
+  *entity_iterator = (iMesh_EntityArrIterator) create_itaps_iterator( entities, array_size );
   RETURN( entity_iterator ? iBase_SUCCESS : iBase_FAILURE );
 }
 
@@ -993,7 +993,7 @@
 void iMeshP_getAdjEntities( iMesh_Instance instance,
                             const iMeshP_PartitionHandle partition_handle,
                             const iMeshP_PartHandle part_handle,
-                            const iBase_EntityHandle entity_set_handle,
+                            const iBase_EntitySetHandle entity_set_handle,
                             const int entity_type_requestor,
                             const int entity_topology_requestor,
                             const int entity_type_requested,
@@ -1101,7 +1101,7 @@
   if (iBase_SUCCESS != *err)
     return;
   
-  *entArr_iterator = create_itaps_iterator( r, requested_array_size );
+  *entArr_iterator = (iMesh_EntityArrIterator)create_itaps_iterator( r, requested_array_size );
   RETURN (iBase_SUCCESS);
 }