Fix 'on_exit' preservation which failed when auto_restart was set first (FG#11).

[simgrid.git] / src / mc / checker / LivenessChecker.hpp

diff --git a/src/mc/checker/LivenessChecker.hpp b/src/mc/checker/LivenessChecker.hpp
index ed4994eaf0d61a0a6f171a3f3bdbf086654199b2..25517a02ed5e8c467dbb1f4814bc9d67dc4c178b 100644 (file)
--- a/src/mc/checker/LivenessChecker.hpp
+++ b/src/mc/checker/LivenessChecker.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team.
+/* Copyright (c) 2007-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -14,15 +14,11 @@
 #include <memory>
 #include <vector>
 
-#include <simgrid_config.h>
-#include <xbt/base.h>
-#include <xbt/automaton.h>
-#include "src/mc/mc_state.h"
 #include "src/mc/checker/Checker.hpp"
-
-SG_BEGIN_DECL()
-
-SG_END_DECL()
+#include "src/mc/mc_state.hpp"
+#include <simgrid/config.h>
+#include <xbt/automaton.h>
+#include <xbt/base.h>
 
 namespace simgrid {
 namespace mc {
@@ -81,7 +77,7 @@ private:
   void purgeVisitedPairs();
   void backtrack();
   std::shared_ptr<Pair> newPair(Pair* pair, xbt_automaton_state_t state, std::shared_ptr<const std::vector<int>> propositions);
-private:
+
   // A stack of (application_state, automaton_state) pairs for DFS exploration:
   std::list<std::shared_ptr<Pair>> explorationStack_;
   std::list<std::shared_ptr<VisitedPair>> acceptancePairs_;