[MOAB-dev] r4754 - in MOAB/trunk: src src/moab tools/dagmc

[sjackson at cae.wisc.edu]

Author: sjackson
Date: 2011-04-20 12:37:18 -0500 (Wed, 20 Apr 2011)
New Revision: 4754

Modified:
   MOAB/trunk/src/OrientedBoxTreeTool.cpp
   MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp
   MOAB/trunk/tools/dagmc/DagMC.cpp
Log:
Fix signedness issue in DagMC's use of obb tree.

This wasn't causing any user-visible problems.  Thanks to Tim for the tip,
and no thanks to gcc for not warning about it.

Modified: MOAB/trunk/src/OrientedBoxTreeTool.cpp
===================================================================
--- MOAB/trunk/src/OrientedBoxTreeTool.cpp	2011-04-20 16:00:21 UTC (rev 4753)
+++ MOAB/trunk/src/OrientedBoxTreeTool.cpp	2011-04-20 17:37:18 UTC (rev 4754)
@@ -1029,7 +1029,7 @@
                       const double*              nonneg_ray_length,
 		      const double*              neg_ray_length,
                       double                     tolerance,
-                      unsigned                   min_tol_intersections,
+                      int                        min_tol_intersections,
                       std::vector<double>&       intersections,
                       std::vector<EntityHandle>& surfaces,
                       std::vector<EntityHandle>& facets,
@@ -1391,7 +1391,7 @@
                                     std::vector<EntityHandle>&       facets_out,
                                     EntityHandle                     root_set,
                                     double                           tolerance,
-                                    unsigned                         min_tolerace_intersections,
+                                    int                              min_tolerace_intersections,
                                     const double                     ray_point[3],
                                     const double                     unit_ray_dir[3],
                                     const double*                    nonneg_ray_length,

Modified: MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp
===================================================================
--- MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp	2011-04-20 16:00:21 UTC (rev 4753)
+++ MOAB/trunk/src/moab/OrientedBoxTreeTool.hpp	2011-04-20 17:37:18 UTC (rev 4754)
@@ -281,7 +281,7 @@
                                   std::vector<EntityHandle>& facets_out,
                                   EntityHandle               root_set,
                                   double                     tolerance,
-                                  unsigned                   min_tolerace_intersections,
+                                  int                        min_tolerace_intersections,
                                   const double               ray_point[3],
                                   const double               unit_ray_dir[3],
                                   const double*              nonneg_ray_len = 0,

Modified: MOAB/trunk/tools/dagmc/DagMC.cpp
===================================================================
--- MOAB/trunk/tools/dagmc/DagMC.cpp	2011-04-20 16:00:21 UTC (rev 4753)
+++ MOAB/trunk/tools/dagmc/DagMC.cpp	2011-04-20 17:37:18 UTC (rev 4754)
@@ -781,7 +781,7 @@
   // If overlaps occur, the pt is inside if traveling along the ray from the
   // origin, there are ever more exits than entrances. In lieu of implementing
   // that, all intersections to infinity are required if overlaps occur (expensive)
-  unsigned min_tolerance_intersections;
+  int min_tolerance_intersections;
   if(0 != overlapThickness) {
     min_tolerance_intersections = -1;
   // only the first intersection is needed if overlaps do not occur (cheap)