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

[Hong-Jun Kim]

I think "iGeom_MOAB" has to be synced too.
It looks this change makes some errors in MOAB.

Hong-Jun

----- Original Message -----
> From: kraftche at cae.wisc.edu
> To: cgma-dev at mcs.anl.gov
> Sent: Wednesday, March 9, 2011 3:35:13 PM
> Subject: [cgma-dev] r4564 - cgm/trunk/itaps
> Author: kraftche
> Date: 2011-03-09 15:35:12 -0600 (Wed, 09 Mar 2011)
> New Revision: 4564
> 
> Modified:
> cgm/trunk/itaps/iBase.h
> cgm/trunk/itaps/iGeom_CGMA.cc
> Log:
> sync with official iBase.h
> 
> Modified: cgm/trunk/itaps/iBase.h
> ===================================================================
> --- cgm/trunk/itaps/iBase.h 2011-03-09 21:27:27 UTC (rev 4563)
> +++ cgm/trunk/itaps/iBase.h 2011-03-09 21:35:12 UTC (rev 4564)
> @@ -7,6 +7,11 @@
> {
> #endif
> 
> +#define IBASE_MINENUM(enumName) enumName ## _MIN
> +#define IBASE_MAXENUM(enumName) enumName ## _MAX
> +#define IBASE_NUMENUM(enumName) ((int)IBASE_MAXENUM(enumName) -
> (int)IBASE_MINENUM(enumName) + 1)
> +#define IBASE_INCENUM(enumName,I) (I = (enum enumName)((int)I+1))
> +
> /*==========================================================
> * TYPEDEF'S
> *==========================================================
> @@ -15,19 +20,22 @@
> typedef struct iBase_EntityHandle_Private* iBase_EntityHandle;
> typedef struct iBase_EntitySetHandle_Private* iBase_EntitySetHandle;
> typedef struct iBase_TagHandle_Private* iBase_TagHandle;
> - typedef void* iBase_EntityIterator;
> - typedef void* iBase_EntityArrIterator;
> + typedef struct iBase_EntityIterator_Private* iBase_EntityIterator;
> + typedef struct iBase_EntityArrIterator_Private*
> iBase_EntityArrIterator;
> 
> +
> /*==========================================================
> * ENTITYTYPE ENUMERATION
> *==========================================================
> */
> enum iBase_EntityType {
> - iBase_VERTEX = 0,
> + iBase_EntityType_MIN = 0,
> + iBase_VERTEX = iBase_EntityType_MIN,
> iBase_EDGE,
> iBase_FACE,
> iBase_REGION,
> - iBase_ALL_TYPES
> + iBase_ALL_TYPES,
> + iBase_EntityType_MAX = iBase_ALL_TYPES
> };
> 
> /*==========================================================
> @@ -35,13 +43,16 @@
> *==========================================================
> */
> enum iBase_AdjacencyCost {
> - iBase_UNAVAILABLE = 0, /**< Adjacency information not supported */
> - iBase_ALL_ORDER_1, /**< No more than local mesh traversal required
> */
> - iBase_ALL_ORDER_LOGN, /**< Global tree search */
> - iBase_ALL_ORDER_N, /**< Global exhaustive search */