X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/03e114f11978dd546b729f043b0d5ffd85c31aa5..e0559282e9a32c820950e87c49a9dc2e6e705c5c:/src/mc/mc_checkpoint.cpp

diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp
index 3295f91bdc..1a3675b5c1 100644
--- a/src/mc/mc_checkpoint.cpp
+++ b/src/mc/mc_checkpoint.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2017. The SimGrid Team.
+/* Copyright (c) 2008-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
 #include "src/mc/mc_private.hpp"
 #include <mc/mc.h>
 
+#include "src/mc/mc_config.hpp"
 #include "src/mc/mc_hash.hpp"
 #include "src/mc/mc_mmu.hpp"
 #include "src/mc/mc_smx.hpp"
@@ -185,13 +186,13 @@ void find_object_address(
   std::vector<simgrid::xbt::VmMap> const& maps,
   simgrid::mc::ObjectInformation* result)
 {
-  std::string name = simgrid::xbt::Path(result->file_name).getBasename();
+  std::string name = simgrid::xbt::Path(result->file_name).get_base_name();
 
   for (size_t i = 0; i < maps.size(); ++i) {
     simgrid::xbt::VmMap const& reg = maps[i];
     if (maps[i].pathname.empty())
       continue;
-    std::string map_basename = simgrid::xbt::Path(maps[i].pathname).getBasename();
+    std::string map_basename = simgrid::xbt::Path(maps[i].pathname).get_base_name();
     if (map_basename != name)
       continue;
 
@@ -517,8 +518,8 @@ static std::vector<s_fd_infos_t> get_current_fds(pid_t pid)
 
     // If dot_output enabled, do not handle the corresponding file
     if (dot_output != nullptr) {
-      std::string link_basename = simgrid::xbt::Path(link).getBasename();
-      if (link_basename == _sg_mc_dot_output_file)
+      std::string link_basename = simgrid::xbt::Path(link).get_base_name();
+      if (link_basename == _sg_mc_dot_output_file.get())
         continue;
     }
 
@@ -560,7 +561,7 @@ std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
 
   snapshot->to_ignore = mc_model_checker->process().ignored_heap();
 
-  if (_sg_mc_max_visited_states > 0 || strcmp(_sg_mc_property_file, "")) {
+  if (_sg_mc_max_visited_states > 0 || not _sg_mc_property_file.get().empty()) {
     snapshot->stacks = take_snapshot_stacks(snapshot.get());
     if (_sg_mc_hash)
       snapshot->hash = simgrid::mc::hash(*snapshot);
@@ -621,3 +622,4 @@ void restore_snapshot(std::shared_ptr<simgrid::mc::Snapshot> snapshot)
 
 }
 }
+