WIP stop using const char* in C++ layers

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

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index f5a789b..4e8285c 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -12,11 +12,6 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifndef WIN32
-#include <sys/mman.h>
-#endif
-
-#include <elfutils/libdw.h>
 
 #include <simgrid/msg.h>
 #include <xbt/config.h>
@@ -28,25 +23,21 @@
 #include "src/mc/mc_base.h"
 
 #include "src/simix/smx_private.h"
-#include "src/xbt/mmalloc/mmprivate.h"
 
 #ifdef __cplusplus
 #include "src/mc/mc_forward.hpp"
 #include "src/xbt/memory_map.hpp"
 #endif
 
-#include "src/mc/mc_protocol.h"
-
 #ifdef __cplusplus
 namespace simgrid {
 namespace mc {
 
-struct DerefAndCompareByNbProcessesAndUsedHeap {
+struct DerefAndCompareByActorsCountAndUsedHeap {
   template<class X, class Y>
   bool operator()(X const& a, Y const& b)
   {
-    return std::make_pair(a->nb_processes, a->heap_bytes_used) <
-      std::make_pair(b->nb_processes, b->heap_bytes_used);
+    return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used);
   }
 };