From b17919ecf9b22d87e32f13836e2ff9aa8e222a97 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 3 Feb 2019 21:12:02 +0000 Subject: Remove boost::filesystem in favour of std::filesystem --- mythfs/Jamfile.jam | 4 +--- mythfs/service/Jamfile.jam | 3 +-- mythfs/service/recordingsVolume.cpp | 6 +++--- mythfs/unittests/Jamfile.jam | 6 ++---- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/mythfs/Jamfile.jam b/mythfs/Jamfile.jam index bb3cbf1..9d831ae 100644 --- a/mythfs/Jamfile.jam +++ b/mythfs/Jamfile.jam @@ -10,9 +10,7 @@ lib dbppcore : : : : /usr/include/dbpp ; lib Ice : : Ice++11 ; lib pthread ; lib IceBox : : IceBox++11 ; -lib boost_filesystem ; -lib boost_system ; -lib boost_thread ; +lib stdc++fs ; lib boost_date_time ; build-project service ; diff --git a/mythfs/service/Jamfile.jam b/mythfs/service/Jamfile.jam index 433deb2..2fb7661 100644 --- a/mythfs/service/Jamfile.jam +++ b/mythfs/service/Jamfile.jam @@ -8,8 +8,7 @@ lib mythfs++11 : ..//netfs-api ..//adhocutil ..//dbppcore - ..//boost_system - ..//boost_filesystem + ..//stdc++fs ..//boost_date_time ..//Ice ..//IceBox diff --git a/mythfs/service/recordingsVolume.cpp b/mythfs/service/recordingsVolume.cpp index 7be25cb..7529b9b 100644 --- a/mythfs/service/recordingsVolume.cpp +++ b/mythfs/service/recordingsVolume.cpp @@ -1,6 +1,6 @@ #include "recordingsVolume.h" #include -#include +#include #include #include "inodes/allDirectory.h" @@ -57,7 +57,7 @@ namespace MythFS { { errno = 0; struct statvfs s; - boost::filesystem::path p("/var/store/mythrecordings"); + std::filesystem::path p("/var/store/mythrecordings"); if (::statvfs(p.c_str(), &s) != 0) { throw NetFS::SystemError(errno); } @@ -122,7 +122,7 @@ namespace MythFS { RecordingsVolume::resolvePath(const std::string & p) { Node::PointerType d = shared_from_this(); - boost::filesystem::path path(p.substr(1)); + std::filesystem::path path(p.substr(1)); for (const auto & e : path) { d = d->getChild(e.string()); } diff --git a/mythfs/unittests/Jamfile.jam b/mythfs/unittests/Jamfile.jam index 2272766..ca9c9d6 100644 --- a/mythfs/unittests/Jamfile.jam +++ b/mythfs/unittests/Jamfile.jam @@ -13,8 +13,7 @@ lib testCommon : ..//dbppcore ..//adhocutil ROOT=\"$(me)\" - ..//boost_system - ..//boost_filesystem + ..//stdc++fs ..//netfs-api ..//Ice ..//IceBox @@ -40,8 +39,7 @@ run fixtures/schema-min.sql : BOOST_TEST_DYN_LINK - ..//boost_system - ..//boost_filesystem + ..//stdc++fs testCommon boost_utf ROOT=\"$(me)\" -- cgit v1.2.3