[cgma-dev] r4579 - cgm/branches/merge-cubit12/itaps

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-03-10 19:41:34 -0600 (Thu, 10 Mar 2011)
New Revision: 4579

Modified:
   cgm/branches/merge-cubit12/itaps/iBase.h
   cgm/branches/merge-cubit12/itaps/iGeom.h
   cgm/branches/merge-cubit12/itaps/iGeom_CGMA.cc
   cgm/branches/merge-cubit12/itaps/testgeom.cc
Log:
changes due to tags interface 
testgeom does not pass yet, but meshkit tests pass
Still investigating


Modified: cgm/branches/merge-cubit12/itaps/iBase.h
===================================================================
--- cgm/branches/merge-cubit12/itaps/iBase.h	2011-03-11 00:44:48 UTC (rev 4578)
+++ cgm/branches/merge-cubit12/itaps/iBase.h	2011-03-11 01:41:34 UTC (rev 4579)
@@ -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 */