X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0ef1caaf350ac106b3431e8afb4246aace1b44d2..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/mc/ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index b88c39ff8b..4ce444b0c3 100644
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -1,18 +1,18 @@
-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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. */
- 
-#ifndef MC_MODEL_CHECKER_H
-#define MC_MODEL_CHECKER_H
+
+#ifndef SIMGRID_MC_MODEL_CHECKER_HPP
+#define SIMGRID_MC_MODEL_CHECKER_HPP
 
 #include <sys/types.h>
 
 #include <simgrid_config.h>
-#include <xbt/dynar.h>
+#include <xbt/dict.h>
 
-#include "mc_forward.h"
+#include "mc_forward.hpp"
 #include "mc_process.h"
 #include "PageStore.hpp"
 #include "mc_protocol.h"
@@ -28,18 +28,18 @@ namespace mc {
  *  on the model-checker heap, we avoid those issues.
  */
 class ModelChecker {
-  // This is the parent snapshot of the current state:
-  s_mc_pages_store_t page_store_;
-  s_mc_process_t process_;
   /** String pool for host names */
   // TODO, use std::unordered_set with heterogeneous comparison lookup (C++14)
   xbt_dict_t /* <hostname, NULL> */ hostnames_;
+  // This is the parent snapshot of the current state:
+  PageStore page_store_;
+  Process process_;
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
   ModelChecker(pid_t pid, int socket);
   ~ModelChecker();
-  s_mc_process_t& process()
+  Process& process()
   {
     return process_;
   }