[cgma-dev] r4457 - in cgm/branches/merge-cubit12: geom geom/testing itaps

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-01-20 17:30:04 -0600 (Thu, 20 Jan 2011)
New Revision: 4457

Modified:
   cgm/branches/merge-cubit12/geom/GeometryQueryTool.cpp
   cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp
   cgm/branches/merge-cubit12/geom/testing/Makefile.am
   cgm/branches/merge-cubit12/itaps/iGeom_CGMA.cc
Log:
fix build with cubit 12.0

Modified: cgm/branches/merge-cubit12/geom/GeometryQueryTool.cpp
===================================================================
--- cgm/branches/merge-cubit12/geom/GeometryQueryTool.cpp	2011-01-20 23:05:42 UTC (rev 4456)
+++ cgm/branches/merge-cubit12/geom/GeometryQueryTool.cpp	2011-01-20 23:30:04 UTC (rev 4457)
@@ -643,8 +643,8 @@
 //
 // Creation Date : 3/29/2007
 //-------------------------------------------------------------------------
-CubitStatus GeometryQueryTool::fire_ray( const CubitVector &origin,
-                                         const CubitVector &direction,
+CubitStatus GeometryQueryTool::fire_ray( CubitVector &origin,
+                                         CubitVector &direction,
                                          DLIList<RefEntity*> &at_entity_list,
                                          DLIList<double> &ray_params,
                                          int max_hits,
@@ -773,8 +773,8 @@
 //
 // Creation Date : 5/19/2007
 //-------------------------------------------------------------------------
-CubitStatus GeometryQueryTool::fire_ray( const CubitVector &origin,
-                                         const CubitVector &direction,
+CubitStatus GeometryQueryTool::fire_ray( CubitVector &origin,
+                                         CubitVector &direction,
                                          DLIList<TopologyEntity*> &at_entity_list,
                                          DLIList<double> &ray_params,
                                          int max_hits,

Modified: cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp
===================================================================
--- cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp	2011-01-20 23:05:42 UTC (rev 4456)
+++ cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp	2011-01-20 23:30:04 UTC (rev 4457)
@@ -444,8 +444,8 @@
     */
 
   //! \brief Fire a ray at entities, passing back distances of hits and entities hit
-  CubitStatus fire_ray( const CubitVector &origin,
-                        const CubitVector &direction,
+  CubitStatus fire_ray( CubitVector &origin,
+                        CubitVector &direction,
                         DLIList<RefEntity*> &at_entity_list,
                         DLIList<double> &ray_params,
                         int max_hits = 0,
@@ -476,8 +476,8 @@
     *  THE SAME GEOMETRY ENGINE. 
     */
   //! \brief Fire a ray at entities, passing back distances of hits and entities hit
-  CubitStatus fire_ray( const CubitVector &origin,
-                        const CubitVector &direction,
+  CubitStatus fire_ray( CubitVector &origin,
+                        CubitVector &direction,
                         DLIList<TopologyEntity*> &at_entity_list,