Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / mc / mc_snapshot.h

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index a7b4b00..3817326 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -131,7 +131,7 @@ typedef struct XBT_PRIVATE s_mc_snapshot_stack {
 typedef struct s_mc_global_t {
   std::shared_ptr<simgrid::mc::Snapshot> snapshot;
   int prev_pair = 0;
-  char *prev_req = nullptr;
+  std::string prev_req;
   int initial_communications_pattern_done = 0;
   int recv_deterministic = 0;
   int send_deterministic = 0;
@@ -213,8 +213,8 @@ XBT_PRIVATE int MC_snapshot_memcmp(
 static inline __attribute__ ((always_inline))
 const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot)
 {
-  if(snapshot==NULL)
-      xbt_die("snapshot is NULL");
+  if(snapshot==nullptr)
+      xbt_die("snapshot is nullptr");
   return mc_model_checker->process().get_heap()->breakval;
 }