[MOAB-dev] r5131 - MOAB/trunk/src/parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-08-29 10:51:42 -0500 (Mon, 29 Aug 2011)
New Revision: 5131

Modified:
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
Log:
fix 32-bit build issues

Modified: MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp	2011-08-29 15:51:22 UTC (rev 5130)
+++ MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp	2011-08-29 15:51:42 UTC (rev 5131)
@@ -1461,7 +1461,7 @@
     
     assert((unsigned)status.MPI_SOURCE == procs[idx]);
     assert(2*recv_buf[idx].front()+1 == recv_buf[idx].size());
-    const size_t n = std::min( recv_buf[idx].front(), (recv_buf[idx].size()-1)/2 );
+    const size_t n = std::min<size_t>( recv_buf[idx].front(), (recv_buf[idx].size()-1)/2 );
     dbgOut.printf(5,"Received buffer of size %lu from proc %d\n",
                   (unsigned long)(2*n+1), (int)status.MPI_SOURCE );
     
@@ -1658,7 +1658,7 @@
         unsigned long* array = reinterpret_cast<unsigned long*>(&tmp[0]);
         std::copy( tmp.begin(), tmp.end(), array );
       }
-      contents = &tmp[0];
+      contents = reinterpret_cast<unsigned long*>(&tmp[0]);
     }
   }