stringify (a lot)

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

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index c094a75..277dead 100644 (file)
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -29,6 +29,7 @@
 #include "src/mc/remote/mc_protocol.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
+extern std::string _sg_mc_property_file;
 
 static inline
 char** argvdup(int argc, char** argv)
@@ -39,18 +40,14 @@ char** argvdup(int argc, char** argv)
   return argv_copy;
 }
 
-static
-std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
+static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
 {
   if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
-    return std::unique_ptr<simgrid::mc::Checker>(
-      simgrid::mc::createCommunicationDeterminismChecker(session));
-  else if (_sg_mc_property_file == nullptr || _sg_mc_property_file[0] == '\0')
-    return std::unique_ptr<simgrid::mc::Checker>(
-      simgrid::mc::createSafetyChecker(session));
+    return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createCommunicationDeterminismChecker(session));
+  else if (_sg_mc_property_file.empty())
+    return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createSafetyChecker(session));
   else
-    return std::unique_ptr<simgrid::mc::Checker>(
-      simgrid::mc::createLivenessChecker(session));
+    return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createLivenessChecker(session));
 }
 
 int main(int argc, char** argv)