Updating from master LBPM-WIA for some helper functions

common/MPI_Helpers.hpp

@@ -27,7 +27,7 @@ void pack( const std::vector<TYPE>& rhs, char *buffer )
     size_t size = rhs.size();
     memcpy(buffer,&size,sizeof(size_t));
     size_t pos = sizeof(size_t);
-    for (int i=0; i<rhs.size(); i++) {
+    for (size_t i=0; i<rhs.size(); i++) {
         pack(rhs[i],&buffer[pos]);
         pos += packsize(rhs[i]);
     }
@@ -40,7 +40,7 @@ void unpack( std::vector<TYPE>& data, const char *buffer )
     data.clear();
     data.resize(size);
     size_t pos = sizeof(size_t);
-    for (int i=0; i<data.size(); i++) {
+    for (size_t i=0; i<data.size(); i++) {
         unpack(data[i],&buffer[pos]);
         pos += packsize(data[i]);
     }

common/Utilities.cpp

@@ -236,9 +236,9 @@ size_t Utilities::getMemoryUsage()
     size_t N_bytes = 0;
     #if defined(USE_LINUX)
         struct mallinfo meminfo = mallinfo();
-        size_t size_hblkhd = static_cast<size_t>( meminfo.hblkhd );
+        size_t size_hblkhd = static_cast<unsigned int>( meminfo.hblkhd );
-        size_t size_uordblks = static_cast<size_t>( meminfo.uordblks );
+        size_t size_uordblks = static_cast<unsigned int>( meminfo.uordblks );
-        N_bytes = static_cast<size_t>( size_hblkhd + size_uordblks );
+        N_bytes = size_hblkhd + size_uordblks;
     #elif defined(USE_MAC)
         struct task_basic_info t_info;
         mach_msg_type_number_t t_info_count = TASK_BASIC_INFO_COUNT;
@@ -347,3 +347,11 @@ std::vector<int> Utilities::factor(size_t number)
     std::sort( factors.begin(), factors.end() );
     return factors;
 }
+
+
+// Dummy function to prevent compiler from optimizing away variable
+void Utilities::nullUse( void* data )
+{
+    NULL_USE(data);
+}
+

common/Utilities.h

@@ -61,6 +61,9 @@ namespace Utilities
     //! Factor a number into it's prime factors
     std::vector<int> factor(size_t number);
 
+    //! Print AMP Banner
+    void nullUse( void* );
+
 } // namespace Utilities