Merge pull request #181 from bcamus/master

[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 413b22d..e9af0b5 100644 (file)
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -19,14 +19,14 @@
 #include "simgrid/sg_config.h"
 #include "src/xbt_modinter.h"
 
+#include "src/mc/Session.hpp"
+#include "src/mc/checker/Checker.hpp"
 #include "src/mc/mc_base.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/mc_safety.h"
 #include "src/mc/mc_comm_pattern.h"
 #include "src/mc/mc_exit.h"
-#include "src/mc/Session.hpp"
-#include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_safety.h"
+#include "src/mc/remote/mc_protocol.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
 
@@ -45,7 +45,7 @@ std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& sessio
   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 || _sg_mc_property_file[0] == '\0')
+  else if (_sg_mc_property_file == nullptr || _sg_mc_property_file[0] == '\0')
     return std::unique_ptr<simgrid::mc::Checker>(
       simgrid::mc::createSafetyChecker(session));
   else