Compare file prefix only.

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

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index 0ef9cfb..0bdeb53 100644 (file)
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -7,22 +6,8 @@
 #ifndef SIMGRID_MC_PRIVATE_H
 #define SIMGRID_MC_PRIVATE_H
 
-#include "simgrid_config.h"
-
-#include <sys/types.h>
-
-#include <stdio.h>
-
-#include <simgrid/msg.h>
-#include <xbt/config.h>
-#include <xbt/base.h>
-#include <xbt/automaton.h>
-
 #include "mc/mc.h"
-#include "mc/datatypes.h"
-#include "src/mc/mc_base.h"
-
-#include "src/simix/smx_private.h"
+#include "xbt/automaton.h"
 
 #ifdef __cplusplus
 #include "src/mc/mc_forward.hpp"
@@ -33,12 +18,11 @@
 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);
   }
 };