[cgma-dev] r6057 - cgm/trunk/geom

[janehu at mcs.anl.gov]

Author: janehu
Date: 2013-09-05 11:59:37 -0500 (Thu, 05 Sep 2013)
New Revision: 6057

Modified:
   cgm/trunk/geom/Curve.hpp
   cgm/trunk/geom/DagType.hpp
   cgm/trunk/geom/GeometryQueryEngine.hpp
   cgm/trunk/geom/Lump.hpp
   cgm/trunk/geom/ModelQueryEngine.hpp
   cgm/trunk/geom/Surface.hpp
Log:
Minor changes to remove warnings for builds, fix provided by DanQing Wu.

Modified: cgm/trunk/geom/Curve.hpp
===================================================================
--- cgm/trunk/geom/Curve.hpp	2013-09-05 16:59:18 UTC (rev 6056)
+++ cgm/trunk/geom/Curve.hpp	2013-09-05 16:59:37 UTC (rev 6057)
@@ -423,11 +423,11 @@
 }
 
 inline
-CubitStatus Curve::mid_point(CubitVector &mid_point)
+CubitStatus Curve::mid_point(CubitVector &mid_point_in)
 {
   double param1 = 0.5 * (start_param() + end_param());
   
-  return position_from_u(param1, mid_point);
+  return position_from_u(param1, mid_point_in);
 }
 
 inline
@@ -444,12 +444,12 @@
 inline
 CubitStatus Curve::mid_point(const CubitVector &point1,
                              const CubitVector &point2,
-                             CubitVector& mid_point )
+                             CubitVector& mid_point_in )
 {
   double param1 = u_from_position(point1);
   double param2 = u_from_position(point2);
   param1 = 0.5 * (param1 + param2);
-  return position_from_u(param1, mid_point);
+  return position_from_u(param1, mid_point_in);
 }
 
   //R CubitStatus

Modified: cgm/trunk/geom/DagType.hpp
===================================================================
--- cgm/trunk/geom/DagType.hpp	2013-09-05 16:59:18 UTC (rev 6056)
+++ cgm/trunk/geom/DagType.hpp	2013-09-05 16:59:37 UTC (rev 6057)
@@ -27,8 +27,8 @@
       // Dimension may be outside the range [0,3], but
       // if so is_valid() will return false.  (i.e. it is
       // possible to construct invalid DagType objects.)
-    inline DagType( int dimension, FunctionalType func )
-      : intType( 3 * dimension + func ) 
+    inline DagType( int dimensionIn, FunctionalType func )
+      : intType( 3 * dimensionIn + func ) 
       { }
     
     
@@ -55,8 +55,8 @@
       // move above a Body or below a RefVertex in the DAG.