X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a5f54e7f74566a2418d243e7885e737c2312a36..939476f1fc7630eb237535b07ed0deef77ce1b24:/src/mc/checker/simgrid_mc.cpp

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index 277deadf9d..a6e3159145 100644
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team.
+/* Copyright (c) 2015-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -16,7 +16,7 @@
 
 #include <xbt/log.h>
 
-#include "simgrid/sg_config.h"
+#include "simgrid/sg_config.hpp"
 #include "src/xbt_modinter.h"
 
 #include "src/mc/Session.hpp"
@@ -29,7 +29,6 @@
 #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)
@@ -44,7 +43,7 @@ static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::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.empty())
+  else if (_sg_mc_property_file.get().empty())
     return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createSafetyChecker(session));
   else
     return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createLivenessChecker(session));
@@ -53,7 +52,6 @@ static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session&
 int main(int argc, char** argv)
 {
   using simgrid::mc::Session;
-  XBT_LOG_CONNECT(mc_main);
 
   try {
     if (argc < 2)