X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..debe4e5871c0c3d1c714bbb1bd28ba7147454aa5:/src/mc/Session.cpp

diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp
index b88f98dd72..7959e9f7df 100644
--- a/src/mc/Session.cpp
+++ b/src/mc/Session.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -13,7 +12,7 @@
 #include "xbt/system_error.hpp"
 #include <mc/mc.h>
 #include <simgrid/modelchecker.h>
-#include <simgrid/sg_config.h>
+#include <simgrid/sg_config.hpp>
 
 #include "src/mc/Session.hpp"
 #include "src/mc/checker/Checker.hpp"
@@ -86,8 +85,12 @@ pid_t do_fork(F code)
 Session::Session(pid_t pid, int socket)
 {
   std::unique_ptr<simgrid::mc::RemoteClient> process(new simgrid::mc::RemoteClient(pid, socket));
+#if HAVE_SMPI
   // TODO, automatic detection of the config from the process
-  process->privatized(smpi_privatize_global_variables != SMPI_PRIVATIZE_NONE);
+  process->privatized(smpi_privatize_global_variables != SmpiPrivStrategies::NONE);
+#else
+  process->privatized(false);
+#endif
   modelChecker_ = std::unique_ptr<ModelChecker>(
     new simgrid::mc::ModelChecker(std::move(process)));
   xbt_assert(mc_model_checker == nullptr);
@@ -122,7 +125,7 @@ void Session::logState()
 {
   mc_model_checker->getChecker()->logState();
 
-  if ((_sg_mc_dot_output_file != nullptr) && (_sg_mc_dot_output_file[0] != '\0')) {
+  if (not _sg_mc_dot_output_file.get().empty()) {
     fprintf(dot_output, "}\n");
     fclose(dot_output);
   }