[cgma-dev] r5984 - in cgm/trunk: . itaps

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-02-08 13:07:14 -0600 (Fri, 08 Feb 2013)
New Revision: 5984

Modified:
   cgm/trunk/configure.ac
   cgm/trunk/itaps/iGeom.h
   cgm/trunk/itaps/iGeom_CGMA.cc
   cgm/trunk/itaps/testgeom.cc
Log:
Made flag for cubit major and minor versions, changed in itaps for its usage, haven't tested if it passes tests. Just check in for Iulian's referance, in case he want to make any changes on top of it. Will do follow-up check on Monday.

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2013-02-07 23:22:50 UTC (rev 5983)
+++ cgm/trunk/configure.ac	2013-02-08 19:07:14 UTC (rev 5984)
@@ -164,6 +164,8 @@
     [CUBIT_CAT_DEFINES=-DACIS_TWEAK_TOOL_CAT; AC_MSG_RESULT([yes])],
     [CUBIT_CAT_DEFINES=; AC_MSG_RESULT([no])])
 
+  AC_DEFINE_UNQUOTED([CUBIT_MAJOR_API], [13], [Cubit Version])
+  AC_DEFINE_UNQUOTED([CUBIT_MINOR_API], [1], [Cubit Minor Version])
   LIBS="$old_LIBS"
   LDFLAGS="$old_LDFLAGS"
   LD_LIBRARY_PATH="$old_LD_LIBRARY_PATH"

Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h	2013-02-07 23:22:50 UTC (rev 5983)
+++ cgm/trunk/itaps/iGeom.h	2013-02-08 19:07:14 UTC (rev 5984)
@@ -2678,9 +2678,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 +2700,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-07 23:22:50 UTC (rev 5983)
+++ cgm/trunk/itaps/iGeom_CGMA.cc	2013-02-08 19:07:14 UTC (rev 5984)
@@ -6094,9 +6094,11 @@
 ITAPS_API void
 iGeom_reflectEnt( iGeom_Instance instance,
                   /*inout*/ iBase_EntityHandle geom_entity,