Merge branch 'master' of framagit.org:simgrid/simgrid

[simgrid.git] / src / mc / remote / RemotePtr.hpp

diff --git a/src/mc/remote/RemotePtr.hpp b/src/mc/remote/RemotePtr.hpp
index 483047f..b8dc09a 100644 (file)
--- a/src/mc/remote/RemotePtr.hpp
+++ b/src/mc/remote/RemotePtr.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2022. 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 T> class Remote {
 private:
-  typename std::aligned_storage<sizeof(T), alignof(T)>::type buffer;
+  typename std::aligned_storage_t<sizeof(T), alignof(T)> buffer;
 
 public:
   Remote() = default;
@@ -135,7 +134,6 @@ template <class T = void> inline RemotePtr<T> remote(uint64_t p)
 {
   return RemotePtr<T>(p);
 }
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
 
 #endif