[MOAB-dev] r1717 - MOAB/trunk/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2008-03-28 13:02:52 -0500 (Fri, 28 Mar 2008)
New Revision: 1717

Modified:
   MOAB/trunk/parallel/MBParallelComm.cpp
Log:
Fixing 64-bit issue with parallel reader.


Modified: MOAB/trunk/parallel/MBParallelComm.cpp
===================================================================
--- MOAB/trunk/parallel/MBParallelComm.cpp	2008-03-28 16:42:32 UTC (rev 1716)
+++ MOAB/trunk/parallel/MBParallelComm.cpp	2008-03-28 18:02:52 UTC (rev 1717)
@@ -30,6 +30,9 @@
 {
 #include "minmax.h"
 #include "gs.h"
+#include "errmem.h"
+#include "types.h"
+#include "sort.h"
 #include "tuple_list.h"
 }
 
@@ -1704,7 +1707,7 @@
     else if (MB_SUCCESS != result) return result;
 
       // go through handle vec (in buffer) and convert to local handles in-place
-    size_t num_ents;
+    int num_ents;
     UNPACK_INT(buff_ptr, num_ents);
     MBEntityHandle *handle_vec = (MBEntityHandle*)buff_ptr;
     result = get_local_handles(handle_vec, num_ents, entities);
@@ -1736,7 +1739,8 @@
       
         // get pointers into buffer for each tag value
       var_len_vals.resize(num_ents);
-      for (std::vector<MBEntityHandle>::size_type i = 0; i < num_ents; ++i) {
+      for (std::vector<MBEntityHandle>::size_type i = 0; 
+           i < (std::vector<MBEntityHandle>::size_type) num_ents; ++i) {
         var_len_vals[i] = buff_ptr;
         buff_ptr += size_arr[i];
         UPC(size_arr[i], " void");