X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..2865125a12cae86515e21999f32efe33de513646:/src/mc/remote/RemotePtr.hpp diff --git a/src/mc/remote/RemotePtr.hpp b/src/mc/remote/RemotePtr.hpp index 5da8005458..16efc9354b 100644 --- a/src/mc/remote/RemotePtr.hpp +++ b/src/mc/remote/RemotePtr.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2023. 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. */ @@ -6,10 +6,9 @@ #ifndef SIMGRID_MC_REMOTE_PTR_HPP #define SIMGRID_MC_REMOTE_PTR_HPP -#include "src/simix/smx_private.hpp" +#include "src/kernel/actor/ActorImpl.hpp" -namespace simgrid { -namespace mc { +namespace simgrid::mc { /** HACK, A value from another process * @@ -27,7 +26,7 @@ namespace mc { */ template class Remote { private: - typename std::aligned_storage::type buffer; + typename std::aligned_storage_t buffer; public: Remote() = default; @@ -38,7 +37,7 @@ public: std::size_t get_buffer_size() const { return sizeof(T); } operator T() const { - static_assert(std::is_trivial::value, "Cannot convert non trivial type"); + static_assert(std::is_trivial_v, "Cannot convert non trivial type"); return *get_buffer(); } void clear() { std::memset(&buffer, 0, sizeof buffer); } @@ -59,11 +58,11 @@ public: * as a `uint64_t`. */ template class RemotePtr { - std::uint64_t address_; + std::uint64_t address_ = 0; public: - RemotePtr() : address_(0) {} - explicit RemotePtr(std::nullptr_t) : address_(0) {} + RemotePtr() = default; + explicit RemotePtr(std::nullptr_t) {} explicit RemotePtr(std::uint64_t address) : address_(address) {} explicit RemotePtr(T* address) : address_((std::uintptr_t)address) {} explicit RemotePtr(Remote p) : address_((std::uintptr_t)*p.get_buffer()) {} @@ -135,7 +134,6 @@ template inline RemotePtr remote(uint64_t p) { return RemotePtr(p); } -} -} +} // namespace simgrid::mc #endif