X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10d9db5b4ff140f64b8cbf8150c1f84887e95a8e..2f2db04b850386899392bc06568f17f071f8620f:/src/mc/AddressSpace.hpp

diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp
index d14040e0f2..2ae6d4d0fd 100644
--- a/src/mc/AddressSpace.hpp
+++ b/src/mc/AddressSpace.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. */
@@ -9,8 +9,7 @@
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/remote/RemotePtr.hpp"
 
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 /** Options for read operations
  *
@@ -19,10 +18,11 @@ namespace mc {
  *  integers are not allowed.
  */
 class ReadOptions {
-  std::uint32_t value_;
+  std::uint32_t value_ = 0;
   constexpr explicit ReadOptions(std::uint32_t value) : value_(value) {}
+
 public:
-  constexpr ReadOptions() : value_(0) {}
+  constexpr ReadOptions() = default;
 
   explicit constexpr operator bool() const { return value_ != 0; }
   constexpr bool operator!() const { return value_ == 0; }
@@ -56,7 +56,7 @@ public:
   }
   ReadOptions& operator^=(ReadOptions const& that)
   {
-    value_ &= that.value_;
+    value_ ^= that.value_;
     return *this;
   }
 
@@ -83,17 +83,17 @@ public:
  */
 class AddressSpace {
 private:
-  RemoteClient* process_;
+  RemoteProcessMemory* remote_process_memory_;
 
 public:
-  explicit AddressSpace(RemoteClient* process) : process_(process) {}
+  explicit AddressSpace(RemoteProcessMemory* process) : remote_process_memory_(process) {}
   virtual ~AddressSpace() = default;
 
   /** The process of this address space
    *
-   *  This is where we can get debug informations, memory layout, etc.
+   *  This is where we can get debug information, memory layout, etc.
    */
-  simgrid::mc::RemoteClient* process() const { return process_; }
+  simgrid::mc::RemoteProcessMemory* get_remote_process_memory() const { return remote_process_memory_; }
 
   /** Read data from the address space
    *
@@ -132,10 +132,8 @@ public:
     this->read_bytes(&res[0], len, address);
     return res;
   }
-
 };
 
-}
-}
+} // namespace simgrid::mc
 
 #endif