Merge branch 'mc'

[simgrid.git] / src / mc / mc_compare.cpp

diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp
index 0ab694a..a00aa37 100644 (file)
--- a/src/mc/mc_compare.cpp
+++ b/src/mc/mc_compare.cpp
@@ -4,6 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#define __STDC_FORMAT_MACROS
 #include <inttypes.h>
 #include <boost/unordered_set.hpp>
 
@@ -166,6 +167,8 @@ static int compare_areas_with_type(struct mc_compare_state& state,
 
       if (addr_pointed1 == NULL && addr_pointed2 == NULL)
         return 0;
+      if (addr_pointed1 == NULL || addr_pointed2 == NULL)
+        return 1;
       if (!add_compared_pointers(state, addr_pointed1, addr_pointed2))
         return 0;
 
@@ -243,8 +246,7 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1,
                                     mc_mem_region_t r2, mc_snapshot_t snapshot1,
                                     mc_snapshot_t snapshot2)
 {
-  xbt_assert(r1 && r2,
-    "Missing region. Did you enable SMPI privatisation? It is not compatible with state comparison.");
+  xbt_assert(r1 && r2, "Missing region.");
   struct mc_compare_state state;
 
   xbt_dynar_t variables;