[mc] Use vector<RegionSnapshot> instead of vector<unique_ptr<RegionSnapshot>> in...

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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 5fb8204..f9a1342 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -1,4 +1,4 @@
-/* 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
@@ -14,7 +14,7 @@
 
 #include "mc_forward.h"
 #include "mc_process.h"
-#include "mc_page_store.h"
+#include "PageStore.hpp"
 #include "mc_protocol.h"
 
 namespace simgrid {
@@ -28,14 +28,12 @@ namespace mc {
  *  on the model-checker heap, we avoid those issues.
  */
 class ModelChecker {
-  // This is the parent snapshot of the current state:
-  mc_pages_store_t page_store_;
-  int fd_clear_refs_;
-  xbt_dynar_t record_;
-  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:
+  s_mc_pages_store_t page_store_;
+  s_mc_process_t process_;
 public:
   ModelChecker(ModelChecker const&) = delete;
   ModelChecker& operator=(ModelChecker const&) = delete;
@@ -45,9 +43,9 @@ public:
   {
     return process_;
   }
-  s_mc_pages_store_t& page_store()
+  PageStore& page_store()
   {
-    return *page_store_;
+    return page_store_;
   }
   const char* get_host_name(const char* name);
 };