[MOAB-dev] r4671 - in MOAB/branches/Version4.0: . itaps/imesh

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-03-28 17:30:54 -0500 (Mon, 28 Mar 2011)
New Revision: 4671

Modified:
   MOAB/branches/Version4.0/
   MOAB/branches/Version4.0/itaps/imesh/iMeshP_MOAB.cpp
Log:
fix build issue with IBM compiler


Property changes on: MOAB/branches/Version4.0
___________________________________________________________________
Modified: svn:mergeinfo
   - /MOAB/trunk:4610-4611,4628,4631,4640-4641,4646,4663
   + /MOAB/trunk:4610-4611,4628,4631,4640-4641,4646,4663,4670

Modified: MOAB/branches/Version4.0/itaps/imesh/iMeshP_MOAB.cpp
===================================================================
--- MOAB/branches/Version4.0/itaps/imesh/iMeshP_MOAB.cpp	2011-03-28 22:10:15 UTC (rev 4670)
+++ MOAB/branches/Version4.0/itaps/imesh/iMeshP_MOAB.cpp	2011-03-28 22:30:54 UTC (rev 4671)
@@ -286,27 +286,6 @@
     }
 };
 
-static ErrorCode intersect_with_set( Interface* mb, Range& range, EntityHandle set )
-{
-  Range tmp;
-  ErrorCode result;
-  result = mb->get_entities_by_handle( set, tmp );
-  range = intersect( range, tmp );
-  return result;
-}
-
-static ErrorCode intersect_with_set( Interface* mb, std::vector<EntityHandle>& list, 
-                                     EntityHandle set )
-{
-  size_t w = 0;
-  for (size_t r = 0; r < list.size(); ++r) {
-    if (mb->contains_entities( set, &list[r], 1))
-      list[w++] = list[r];
-  }
-  list.resize(w);
-  return MB_SUCCESS;
-}
-
 template <class Container> 
 class SetIntersectIter : public MBIter<Container>
 {
@@ -321,6 +300,27 @@
       : MBIter<Container>( type, topology, set, array_size ),
         otherSet( other_set )
       {}
+
+
+    inline ErrorCode intersect_with_set( Interface* mb, Range& range )
+    {
+      Range tmp;
+      ErrorCode result;
+      result = mb->get_entities_by_handle( otherSet, tmp );
+      range = intersect( range, tmp );