Fix MC build after changes for waitany.

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

diff --git a/src/mc/mc_xbt.cpp b/src/mc/mc_xbt.cpp
index 5f1780b..5d3f00e 100644 (file)
--- a/src/mc/mc_xbt.cpp
+++ b/src/mc/mc_xbt.cpp
@@ -1,32 +1,36 @@
-/* Copyright (c) 2014-2015. The SimGrid Team.
+/* Copyright (c) 2014-2019. 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. */
 
-#include <xbt/sysdep.h>
+#include <cstddef>
 
-#include "mc/AddressSpace.hpp"
-#include "mc_xbt.hpp"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/mc_xbt.hpp"
+#include "src/mc/remote/RemotePtr.hpp"
+
+#include "xbt/dynar.h"
+#include "xbt/sysdep.h"
 
 namespace simgrid {
 namespace mc {
 
 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)
 {
   s_xbt_dynar_t d;
   as.read_bytes(&d, sizeof(d), addr);
   if (i >= d.used)
-    xbt_die("Out of bound index %zi/%lu", i, d.used);
+    xbt_die("Out of bound index %zu/%lu", i, d.used);
   if (len != d.elmsize)
     xbt_die("Bad size in simgrid::mc::read_element");
   as.read_bytes(local, len, remote(xbt_dynar_get_ptr(&d, i)));
 }
 
-std::size_t read_length(AddressSpace const& as, remote_ptr<s_xbt_dynar_t> addr)
+std::size_t read_length(AddressSpace const& as, RemotePtr<s_xbt_dynar_t> addr)
 {
-  if (!addr)
+  if (not addr)
     return 0;
   unsigned long res;
   as.read_bytes(&res, sizeof(res),