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

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

diff --git a/src/mc/mc_xbt.hpp b/src/mc/mc_xbt.hpp
index b83fb5f3d1eff2f948628c09a9cfc39bd11a7b18..cc23b1aca015801655e92f70124faa8a66114485 100644 (file)
--- a/src/mc/mc_xbt.hpp
+++ b/src/mc/mc_xbt.hpp
@@ -7,15 +7,18 @@
 #ifndef SIMGRID_MC_XBT_HPP
 #define SIMGRID_MC_XBT_HPP
 
-#include <xbt/base.h>
+#include <cstddef>
 
-#include "mc/AddressSpace.hpp"
+#include <xbt/dynar.h>
+
+#include "src/mc/remote_ptr.hpp"
+#include "src/mc/AddressSpace.hpp"
 
 namespace simgrid {
 namespace mc {
 
 XBT_PRIVATE void read_element(AddressSpace const& as,
-  void* local, remote_ptr<s_xbt_dynar_t> addr, size_t i, size_t len);
+  void* local, remote_ptr<s_xbt_dynar_t> addr, std::size_t i, std::size_t len);
 XBT_PRIVATE std::size_t read_length(
   AddressSpace const& as, remote_ptr<s_xbt_dynar_t> addr);