X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..debe4e5871c0c3d1c714bbb1bd28ba7147454aa5:/src/mc/mc_state.hpp

diff --git a/src/mc/mc_state.hpp b/src/mc/mc_state.hpp
index edef946f08..bfdce906d9 100644
--- a/src/mc/mc_state.hpp
+++ b/src/mc/mc_state.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2019. 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,9 +9,11 @@
 #include <list>
 #include <memory>
 
-#include "src/mc/Transition.hpp"
 #include "src/mc/mc_record.hpp"
-#include "src/mc/mc_snapshot.hpp"
+#include "src/mc/sosp/mc_snapshot.hpp"
+
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/mc/Transition.hpp"
 
 namespace simgrid {
 namespace mc {
@@ -106,14 +108,14 @@ public:
   Transition transition;
 
   /** The simcall which was executed, going out of that state */
-  s_smx_simcall_t executed_req;
+  s_smx_simcall executed_req;
 
   /* Internal translation of the executed_req simcall
    *
    * SIMCALL_COMM_TESTANY is translated to a SIMCALL_COMM_TEST
    * and SIMCALL_COMM_WAITANY to a SIMCALL_COMM_WAIT.
    */
-  s_smx_simcall_t internal_req;
+  s_smx_simcall internal_req;
 
   /* Can be used as a copy of the remote synchro object */
   simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> internal_comm;
@@ -125,10 +127,10 @@ public:
   std::vector<std::vector<simgrid::mc::PatternCommunication>> incomplete_comm_pattern;
   std::vector<unsigned> communicationIndices;
 
-  State(unsigned long state_number);
+  explicit State(unsigned long state_number);
 
   std::size_t interleaveSize() const;
-  void addInterleavingSet(smx_actor_t actor) { this->actorStates[actor->pid].consider(); }
+  void addInterleavingSet(smx_actor_t actor) { this->actorStates[actor->get_pid()].consider(); }
   Transition getTransition() const;
 };
 }