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

[iulian at mcs.anl.gov]

Author: iulian
Date: 2013-02-09 08:50:42 -0600 (Sat, 09 Feb 2013)
New Revision: 5989

Modified:
   cgm/trunk/configure.ac
   cgm/trunk/itaps/iGeom.h
   cgm/trunk/itaps/iGeom_CGMA.cc
   cgm/trunk/itaps/testgeom.cc
Log:
revert to version 5983 to silence the buildbot, over the weekend.
occ based builds need to work on cgm trunk, too.


Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2013-02-09 00:21:46 UTC (rev 5988)
+++ cgm/trunk/configure.ac	2013-02-09 14:50:42 UTC (rev 5989)
@@ -164,8 +164,6 @@
     [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-09 00:21:46 UTC (rev 5988)
+++ cgm/trunk/itaps/iGeom.h	2013-02-09 14:50:42 UTC (rev 5989)
@@ -2678,11 +2678,9 @@
      */
   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,
@@ -2700,11 +2698,9 @@
      */
   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-09 00:21:46 UTC (rev 5988)
+++ cgm/trunk/itaps/iGeom_CGMA.cc	2013-02-09 14:50:42 UTC (rev 5989)
@@ -6094,11 +6094,9 @@
 ITAPS_API void
 iGeom_reflectEnt( iGeom_Instance instance,
                   /*inout*/ iBase_EntityHandle geom_entity,