[mc] Use the symbolic values for the xbt_automaton_exp_label::type enum

[simgrid.git] / src / mc / simgrid_mc.cpp

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index 949ed65..9e857eb 100644 (file)
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -45,10 +45,6 @@ char** argvdup(int argc, char** argv)
 static
 std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
 {
-  using simgrid::mc::Session;
-  using simgrid::mc::FunctionalChecker;
-
-  std::function<int(Session& session)> code;
   if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
     return std::unique_ptr<simgrid::mc::Checker>(
       new simgrid::mc::CommunicationDeterminismChecker(session));
@@ -57,10 +53,7 @@ std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& sessio
       new simgrid::mc::SafetyChecker(session));
   else
     return std::unique_ptr<simgrid::mc::Checker>(
-      new simgrid::mc::LivenessChecker(session));
-
-  return std::unique_ptr<simgrid::mc::Checker>(
-    new FunctionalChecker(session, std::move(code)));
+      simgrid::mc::createLivenessChecker(session));
 }
 
 int main(int argc, char** argv)
@@ -89,6 +82,7 @@ int main(int argc, char** argv)
     simgrid::mc::session = session.get();
     std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);
     int res = checker->run();
+    checker = nullptr;
     session->close();
     return res;
   }