[mc] Move code in simgrid::mc

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

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index a5dbc31..1d19bc5 100644 (file)
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -12,6 +12,7 @@
 
 #include <utility>
 
+#include <fcntl.h>
 #include <signal.h>
 #include <poll.h>
 
@@ -27,6 +28,7 @@
 #endif
 
 #include <xbt/log.h>
+#include <xbt/sysdep.h>
 #include <xbt/system_error.hpp>
 
 #include "simgrid/sg_config.h"
@@ -136,7 +138,7 @@ char** argvdup(int argc, char** argv)
 {
   char** argv_copy = xbt_new(char*, argc+1);
   std::memcpy(argv_copy, argv, sizeof(char*) * argc);
-  argv_copy[argc] = NULL;
+  argv_copy[argc] = nullptr;
   return argv_copy;
 }
 
@@ -172,9 +174,9 @@ int main(int argc, char** argv)
     if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
       res = MC_modelcheck_comm_determinism();
     else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0')
-      res = MC_modelcheck_safety();
+      res = simgrid::mc::modelcheck_safety();
     else
-      res = MC_modelcheck_liveness();
+      res = simgrid::mc::modelcheck_liveness();
     mc_model_checker->shutdown();
     return res;
   }