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

[simgrid.git] / src / mc / Process.hpp

diff --git a/src/mc/Process.hpp b/src/mc/Process.hpp
index 6ecad0e6669fad60dc5e500ce374735ecbc7b865..4ab4e06ef9f5a15fd93b11604bb149818996fa46 100644 (file)
--- a/src/mc/Process.hpp
+++ b/src/mc/Process.hpp
@@ -7,17 +7,19 @@
 #ifndef SIMGRID_MC_PROCESS_H
 #define SIMGRID_MC_PROCESS_H
 
-#include <type_traits>
-
-#include <sys/types.h>
+#include <cstdint>
+#include <cstddef>
 
+#include <type_traits>
 #include <vector>
 #include <memory>
 
-#include "simgrid_config.h"
 #include <sys/types.h>
 
+#include <simgrid_config.h>
+
 #include <xbt/base.h>
+#include <xbt/dynar.h>
 #include <xbt/mmalloc.h>
 
 #ifdef HAVE_MC
@@ -32,7 +34,6 @@
 
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_base.h"
-#include "src/mc/mc_mmalloc.h" // std_heap
 #include "src/mc/AddressSpace.hpp"
 #include "src/mc/mc_protocol.h"
 #include "src/mc/ObjectInformation.hpp"
@@ -50,14 +51,14 @@ namespace mc {
 
 struct IgnoredRegion {
   std::uint64_t addr;
-  size_t size;
+  std::size_t size;
 };
 
 struct IgnoredHeapRegion {
   int block;
   int fragment;
   void *address;
-  size_t size;
+  std::size_t size;
 };
 
 /** Representation of a process