[cgma-dev] r4447 - cgm/trunk/itaps

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-01-14 17:37:33 -0600 (Fri, 14 Jan 2011)
New Revision: 4447

Modified:
   cgm/trunk/itaps/iGeom.h
   cgm/trunk/itaps/iGeom_CGMA.cc
Log:
Changing iGeom_Entity[Arr]Iterator to iBase_Entity[Arr]Iterator.

Passes make check.



Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h	2011-01-14 23:34:53 UTC (rev 4446)
+++ cgm/trunk/itaps/iGeom.h	2011-01-14 23:37:33 UTC (rev 4447)
@@ -69,18 +69,6 @@
      */
   typedef struct iGeom_Instance_Private* iGeom_Instance;
 
-    /**\brief  Type used to store an iterator returned by iGeom
-     *
-     * Type used to store an iterator returned by iGeom
-     */
-  typedef struct iGeom_EntityIterator_Private* iGeom_EntityIterator;
-
-    /**\brief  Type used to store an array iterator returned by iGeom
-     *
-     * Type used to store an array iterator returned by iGeom
-     */
-  typedef struct iGeom_EntityArrIterator_Private* iGeom_EntityArrIterator;
-
     /**\brief  Get a description of the error returned from the last iGeom call
      *
      * Get a description of the error returned from the last iGeom function
@@ -2332,7 +2320,7 @@
   void iGeom_initEntIter( iGeom_Instance instance,
                           iBase_EntitySetHandle entity_set_handle,
                           int requested_entity_type,
-                          iGeom_EntityIterator* entity_iterator,
+                          iBase_EntityIterator* entity_iterator,
                           int* err );
 
     /**\brief  Initialize an array iterator over specified entity type and size
@@ -2354,7 +2342,7 @@
                              iBase_EntitySetHandle entity_set_handle,
                              int requested_entity_type,
                              int requested_array_size,
-                             iGeom_EntityArrIterator* entArr_iterator,
+                             iBase_EntityArrIterator* entArr_iterator,
                              int* err );
 
     /**\brief  Get entity corresponding to an iterator and increment iterator
@@ -2373,7 +2361,7 @@
      * \param *err Pointer to error type returned from function
      */
   void iGeom_getNextEntIter( iGeom_Instance instance,
-                             iGeom_EntityIterator entity_iterator,
+                             iBase_EntityIterator entity_iterator,
                              iBase_EntityHandle* entity_handle,
                              int* has_data,
                              int* err );
@@ -2399,7 +2387,7 @@