X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/740d50812a81c59013f22888ab313da5a8113227..f9436b840852218b39dce22d6057b6f223168daa:/src/mc/mc_xbt.cpp?ds=sidebyside diff --git a/src/mc/mc_xbt.cpp b/src/mc/mc_xbt.cpp index bfdd15619b..86c0144275 100644 --- a/src/mc/mc_xbt.cpp +++ b/src/mc/mc_xbt.cpp @@ -6,9 +6,9 @@ #include -#include "src/mc/remote_ptr.hpp" #include "src/mc/AddressSpace.hpp" #include "src/mc/mc_xbt.hpp" +#include "src/mc/remote/RemotePtr.hpp" #include #include @@ -17,7 +17,7 @@ namespace simgrid { namespace mc { void read_element(AddressSpace const& as, - void* local, remote_ptr addr, std::size_t i, std::size_t len) + void* local, RemotePtr addr, std::size_t i, std::size_t len) { s_xbt_dynar_t d; as.read_bytes(&d, sizeof(d), addr); @@ -28,9 +28,9 @@ void read_element(AddressSpace const& as, as.read_bytes(local, len, remote(xbt_dynar_get_ptr(&d, i))); } -std::size_t read_length(AddressSpace const& as, remote_ptr addr) +std::size_t read_length(AddressSpace const& as, RemotePtr addr) { - if (!addr) + if (not addr) return 0; unsigned long res; as.read_bytes(&res, sizeof(res),