Merge branch 'master' of framagit.org:simgrid/simgrid

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

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index 3ad86ea..6b7ffe1 100644 (file)
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -11,12 +11,9 @@
 
 #include <algorithm>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc, "Logging specific to mc_compare in mc");
 
-using simgrid::mc::remote;
-
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 /*********************************** Heap comparison ***********************************/
 /***************************************************************************************/
@@ -127,8 +124,7 @@ public:
   void match_equals(const HeapLocationPairs* list);
 };
 
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
 
 /************************************************************************************/
 
@@ -155,8 +151,7 @@ static bool is_block_stack(const simgrid::mc::RemoteProcess& process, int block)
                      [block](auto const& stack) { return stack.block == block; });
 }
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 void StateComparator::match_equals(const HeapLocationPairs* list)
 {
@@ -820,7 +815,8 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat
 
     if (type_size != -1 && type_size != (ssize_t)heapinfo1->busy_block.busy_size &&
         type_size != (ssize_t)heapinfo2->busy_block.busy_size &&
-        (type->name.empty() || type->name == "struct s_smx_context")) {
+        (type->name.empty() ||
+         type->name == "struct s_smx_context")) { // FIXME: there is no struct s_smx_context anymore
       if (match_pairs)
         state.match_equals(previous);
       return false;
@@ -975,19 +971,17 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat
     return true;
 
   /* Start comparison */
-  bool differ = type ? heap_area_differ_with_type(process, state, area1, area2, snapshot1, snapshot2, previous, type,
-                                                  size, check_ignore, pointer_level)
-                     : heap_area_differ_without_type(process, state, area1, area2, snapshot1, snapshot2, previous, size,
-                                                     check_ignore);
-  if (differ)
+  if (type ? heap_area_differ_with_type(process, state, area1, area2, snapshot1, snapshot2, previous, type, size,
+                                        check_ignore, pointer_level)
+           : heap_area_differ_without_type(process, state, area1, area2, snapshot1, snapshot2, previous, size,
+                                           check_ignore))
     return true;
 
   if (match_pairs)
     state.match_equals(previous);
   return false;
 }
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
 
 /************************** Snapshot comparison *******************************/
 /******************************************************************************/
@@ -1178,8 +1172,7 @@ static bool local_variables_differ(const simgrid::mc::RemoteProcess& process, si
   return false;
 }
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
 {
@@ -1267,5 +1260,4 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
 
   return true;
 }
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc