MC_smx_get_maxpid returns an unsigned long.

diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp
index e4f7e93..d696b0e 100644 (file)
--- a/src/mc/checker/CommunicationDeterminismChecker.cpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.cpp
@@ -63,10 +63,10 @@ static void patterns_copy(std::vector<simgrid::mc::PatternCommunication*>& dest,
 
 static void restore_communications_pattern(simgrid::mc::State* state)
 {
-  for (unsigned i = 0; i < initial_communications_pattern.size(); i++)
+  for (size_t i = 0; i < initial_communications_pattern.size(); i++)
     initial_communications_pattern[i].index_comm = state->communication_indices_[i];
 
-  for (unsigned i = 0; i < mcapi::get().get_maxpid(); i++)
+  for (unsigned long i = 0; i < mcapi::get().get_maxpid(); i++)
     patterns_copy(incomplete_communications_pattern[i], state->incomplete_comm_pattern_[i]);
 }
 
@@ -320,7 +320,7 @@ void CommunicationDeterminismChecker::log_state() // override
 
 void CommunicationDeterminismChecker::prepare()
 {
-  const int maxpid = mcapi::get().get_maxpid();
+  const auto maxpid = mcapi::get().get_maxpid();
 
   initial_communications_pattern.resize(maxpid);
   incomplete_communications_pattern.resize(maxpid);
@@ -364,10 +364,10 @@ void CommunicationDeterminismChecker::restoreState()
   /* Restore the initial state */
   mcapi::get().restore_initial_state();
 
-  unsigned n = mcapi::get().get_maxpid();
+  unsigned long n = mcapi::get().get_maxpid();
   assert(n == incomplete_communications_pattern.size());
   assert(n == initial_communications_pattern.size());
-  for (unsigned j = 0; j < n; j++) {
+  for (unsigned long j = 0; j < n; j++) {
     incomplete_communications_pattern[j].clear();
     initial_communications_pattern[j].index_comm = 0;
   }

diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 967d730..ffd5e52 100644 (file)
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -44,7 +44,7 @@ Transition State::get_transition() const
 void State::copy_incomplete_comm_pattern()
 {
   incomplete_comm_pattern_.clear();
-  for (auto i=0; i < mcapi::get().get_maxpid(); i++) {
+  for (unsigned long i = 0; i < mcapi::get().get_maxpid(); i++) {
     std::vector<simgrid::mc::PatternCommunication> res;
     for (auto const& comm : incomplete_communications_pattern[i])
       res.push_back(comm->dup());