start reducing smells in MC code

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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index a1138ce..cae6e5a 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -19,11 +19,11 @@
 #include <xbt/base.h>
 #include <sys/types.h>
 
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/Process.hpp"
 #include "src/mc/PageStore.hpp"
-#include "src/mc/mc_protocol.h"
+#include "src/mc/Process.hpp"
 #include "src/mc/Transition.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/remote/mc_protocol.h"
 
 namespace simgrid {
 namespace mc {
@@ -32,7 +32,8 @@ namespace mc {
  */
 class ModelChecker {
   struct event_base *base_;
-  struct event *socket_event_, *signal_event_;
+  struct event* socket_event_;
+  struct event* signal_event_;
   /** String pool for host names */
   // TODO, use std::set with heterogeneous comparison lookup (C++14)?
   std::set<std::string> hostnames_;
@@ -46,7 +47,7 @@ public:
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
-  ModelChecker(std::unique_ptr<Process> process);
+  explicit ModelChecker(std::unique_ptr<Process> process);
   ~ModelChecker();
 
   Process& process()