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

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-02-12 09:54:42 -0600 (Tue, 12 Feb 2013)
New Revision: 5996

Modified:
   cgm/trunk/itaps/iGeom.h
   cgm/trunk/itaps/iGeom_CGMA.cc
   cgm/trunk/itaps/testgeom.cc
Log:
Realized that this version is only cubit13.1 on cgm, the release flag itself will be enough for meshkit, and code doesn't need use cubit 12.2 and under.

Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h	2013-02-11 18:49:04 UTC (rev 5995)
+++ cgm/trunk/itaps/iGeom.h	2013-02-12 15:54:42 UTC (rev 5996)
@@ -2681,11 +2681,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,
@@ -2703,11 +2701,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-11 18:49:04 UTC (rev 5995)
+++ cgm/trunk/itaps/iGeom_CGMA.cc	2013-02-12 15:54:42 UTC (rev 5996)
@@ -6094,30 +6094,22 @@
 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,
-#endif
                   /*in*/ double plane_normal_x,
                   /*in*/ double plane_normal_y,
                   /*in*/ double plane_normal_z,
                   int* err )
 {
   CubitVector this_plane(plane_normal_x, plane_normal_y, plane_normal_z);
-#if CUBIT_MAJOR_API == 13
   CubitVector point(point_x, point_y, point_z);
-#endif