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

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-02-11 12:39:29 -0600 (Mon, 11 Feb 2013)
New Revision: 5994

Modified:
   cgm/trunk/itaps/iGeom.h
   cgm/trunk/itaps/iGeom_CGMA.cc
   cgm/trunk/itaps/testgeom.cc
Log:
Added flag in itaps to enable compatibility with cubit12.2 and before. Passed parallel/serial occ/cubit builds and tests.

Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h	2013-02-11 18:39:25 UTC (rev 5993)
+++ cgm/trunk/itaps/iGeom.h	2013-02-11 18:39:29 UTC (rev 5994)
@@ -63,6 +63,9 @@
 extern "C" {
 #endif
 
+#define  CUBIT_MAJOR_API  13
+#define  CUBIT_MINOR_API  1
+
     /**\brief  Type used to store iGeom interface handle
      *
      * Type used to store iGeom interface handle
@@ -2678,9 +2681,11 @@
      */
   void iGeom_reflectEnt( iGeom_Instance instance,
                          iBase_EntityHandle geom_entity,
+#if CUBIT_MAJOR_API == 13
                          double point_x,
                          double point_y,
                          double point_z,
+#endif
                          double plane_normal_x,
                          double plane_normal_y,
                          double plane_normal_z,
@@ -2698,9 +2703,11 @@
      */
   void iGeom_scaleEnt( iGeom_Instance instance,
                        iBase_EntityHandle geom_entity,
+#if CUBIT_MAJOR_API == 13
                        double point_x,
                        double point_y,
                        double point_z,
+#endif
                        double scale_x,
                        double scale_y,
                        double scale_z,

Modified: cgm/trunk/itaps/iGeom_CGMA.cc
===================================================================
--- cgm/trunk/itaps/iGeom_CGMA.cc	2013-02-11 18:39:25 UTC (rev 5993)
+++ cgm/trunk/itaps/iGeom_CGMA.cc	2013-02-11 18:39:29 UTC (rev 5994)
@@ -6094,22 +6094,30 @@
 ITAPS_API void
 iGeom_reflectEnt( iGeom_Instance instance,
                   /*inout*/ iBase_EntityHandle geom_entity,
+#if CUBIT_MAJOR_API == 13
                   /*in*/ double point_x,
                   /*in*/ double point_y,
                   /*in*/ double point_z,