Rewrite without delegated constructor.

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

diff --git a/src/mc/mc_xbt.hpp b/src/mc/mc_xbt.hpp
index e6dbd53..f3191b9 100644 (file)
--- a/src/mc/mc_xbt.hpp
+++ b/src/mc/mc_xbt.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
+/* Copyright (c) 2014-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,17 +7,18 @@
 #ifndef SIMGRID_MC_XBT_HPP
 #define SIMGRID_MC_XBT_HPP
 
-#include <xbt/base.h>
+#include "xbt/dynar.h"
 
 #include "src/mc/AddressSpace.hpp"
+#include "src/mc/remote/RemotePtr.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, RemotePtr<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);
+  AddressSpace const& as, RemotePtr<s_xbt_dynar_t> addr);
 
 }
 }