[MOAB-dev] r4618 - MOAB/branches/Version4.0/itaps/imesh

[jvporter at wisc.edu]

Author: jvporter
Date: 2011-03-21 14:15:38 -0500 (Mon, 21 Mar 2011)
New Revision: 4618

Modified:
   MOAB/branches/Version4.0/itaps/imesh/MBiMesh.hpp
   MOAB/branches/Version4.0/itaps/imesh/MOAB_iMeshP_unit_tests.cpp
   MOAB/branches/Version4.0/itaps/imesh/iMeshP.h
Log:
Parallel builds should now actually pass on the 4.0 branch. Proof that I need
to test parallel stuff before committing more often...


Modified: MOAB/branches/Version4.0/itaps/imesh/MBiMesh.hpp
===================================================================
--- MOAB/branches/Version4.0/itaps/imesh/MBiMesh.hpp	2011-03-21 16:51:30 UTC (rev 4617)
+++ MOAB/branches/Version4.0/itaps/imesh/MBiMesh.hpp	2011-03-21 19:15:38 UTC (rev 4618)
@@ -2,6 +2,7 @@
 #define MBIMESH_HPP
 
 #include "moab/Core.hpp"
+#include "moab/Range.hpp"
 #include <vector>
 #include <algorithm>
 

Modified: MOAB/branches/Version4.0/itaps/imesh/MOAB_iMeshP_unit_tests.cpp
===================================================================
--- MOAB/branches/Version4.0/itaps/imesh/MOAB_iMeshP_unit_tests.cpp	2011-03-21 16:51:30 UTC (rev 4617)
+++ MOAB/branches/Version4.0/itaps/imesh/MOAB_iMeshP_unit_tests.cpp	2011-03-21 19:15:38 UTC (rev 4618)
@@ -1616,7 +1616,7 @@
       std::sort( shared_verts, shared_verts + num_shared_verts );
   
         // test single entity iterator
-      iMesh_EntityIterator siter;
+      iBase_EntityIterator siter;
       iMeshP_initPartBdryEntIter( imesh, prtn, local_handle, iBase_VERTEX, iMesh_POINT,
                                   other_id, &siter, &ierr );
       if (ierr != iBase_SUCCESS) {
@@ -1644,7 +1644,7 @@
       iMesh_endEntIter( imesh, siter, &ierr );
       
         // test array iterator
-      iMesh_EntityArrIterator aiter;
+      iBase_EntityArrIterator aiter;
       iMeshP_initPartBdryEntArrIter( imesh, prtn, local_handle, iBase_VERTEX, iMesh_POINT,
                                      num_shared_verts, other_id, &aiter, &ierr );
       if (ierr != iBase_SUCCESS) {

Modified: MOAB/branches/Version4.0/itaps/imesh/iMeshP.h
===================================================================
--- MOAB/branches/Version4.0/itaps/imesh/iMeshP.h	2011-03-21 16:51:30 UTC (rev 4617)
+++ MOAB/branches/Version4.0/itaps/imesh/iMeshP.h	2011-03-21 19:15:38 UTC (rev 4618)
@@ -905,7 +905,7 @@
             int entity_type, 
             int entity_topology, 
             iMeshP_Part target_part_id, 
-            iMesh_EntityIterator* entity_iterator, 
+            iBase_EntityIterator* entity_iterator, 
             int *err); 
 
 
@@ -946,7 +946,7 @@
             int entity_topology,