Use 'using-declarations' to inherit constructors.

[simgrid.git] / src / mc / AddressSpace.hpp

diff --git a/src/mc/AddressSpace.hpp b/src/mc/AddressSpace.hpp
index 6a5392c..005adaa 100644 (file)
--- a/src/mc/AddressSpace.hpp
+++ b/src/mc/AddressSpace.hpp
@@ -23,7 +23,7 @@ class ReadOptions {
   constexpr explicit ReadOptions(std::uint32_t value) : value_(value) {}
 
 public:
-  constexpr ReadOptions() {}
+  constexpr ReadOptions() = default;
 
   explicit constexpr operator bool() const { return value_ != 0; }
   constexpr bool operator!() const { return value_ == 0; }
@@ -57,7 +57,7 @@ public:
   }
   ReadOptions& operator^=(ReadOptions const& that)
   {
-    value_ &= that.value_;
+    value_ ^= that.value_;
     return *this;
   }
 
@@ -84,17 +84,17 @@ public:
  */
 class AddressSpace {
 private:
-  RemoteClient* process_;
+  RemoteSimulation* remote_simulation_;
 
 public:
-  explicit AddressSpace(RemoteClient* process) : process_(process) {}
+  explicit AddressSpace(RemoteSimulation* remote_simulation) : remote_simulation_(remote_simulation) {}
   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::RemoteSimulation* get_remote_simulation() const { return remote_simulation_; }
 
   /** Read data from the address space
    *