From 7ff9cea5b5226fafac4615af1c6f1bb3cc75366a Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 13 Jul 2018 16:32:23 +0200 Subject: [PATCH] Get rid of dependency on boost::filesystem. --- examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt | 2 +- .../replay_multiple_manual.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt index 269a06e4bb..109ee5fc23 100644 --- a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt +++ b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt @@ -2,7 +2,7 @@ if(enable_smpi) include_directories(BEFORE "${CMAKE_HOME_DIRECTORY}/include/smpi") # Boost regex dependency - find_package(Boost COMPONENTS regex filesystem REQUIRED) + find_package(Boost COMPONENTS regex REQUIRED) add_executable (replay_multiple_manual replay_multiple_manual.cpp) target_link_libraries(replay_multiple_manual simgrid ${Boost_LIBRARIES}) diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp index 1b7330ea65..59550d32a9 100644 --- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp +++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp @@ -26,12 +26,12 @@ #include #include -#include #include #include #include #include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(replay_multiple_manual, "Messages specific for this example"); @@ -174,8 +174,8 @@ static std::vector all_jobs(const std::string& workload_file) xbt_assert(f.is_open(), "Cannot open file '%s'.", workload_file.c_str()); std::vector jobs; - boost::filesystem::path path(workload_file); - std::string dir = path.parent_path().native(); + simgrid::xbt::Path path(workload_file); + std::string dir = path.get_dir_name(); boost::regex r(R"(^\s*(\S+)\s+(\S+\.txt)\s+(\d+)\s+(\d+)\s+(\d+(?:,\d+)*).*$)"); std::string line; -- 2.20.1