diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-02-03 21:12:02 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-02-03 21:12:02 +0000 |
| commit | b17919ecf9b22d87e32f13836e2ff9aa8e222a97 (patch) | |
| tree | e895507ce523764f03b97f2bced25845a0ce6b16 | |
| parent | Update test fixtures (diff) | |
| download | mythfs-b17919ecf9b22d87e32f13836e2ff9aa8e222a97.tar.bz2 mythfs-b17919ecf9b22d87e32f13836e2ff9aa8e222a97.tar.xz mythfs-b17919ecf9b22d87e32f13836e2ff9aa8e222a97.zip | |
Remove boost::filesystem in favour of std::filesystemmythfs-0.3.2
| -rw-r--r-- | mythfs/Jamfile.jam | 4 | ||||
| -rw-r--r-- | mythfs/service/Jamfile.jam | 3 | ||||
| -rw-r--r-- | mythfs/service/recordingsVolume.cpp | 6 | ||||
| -rw-r--r-- | 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 : : : : <include>/usr/include/dbpp ; lib Ice : : <name>Ice++11 ; lib pthread ; lib IceBox : : <name>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 : <library>..//netfs-api <library>..//adhocutil <library>..//dbppcore - <library>..//boost_system - <library>..//boost_filesystem + <library>..//stdc++fs <library>..//boost_date_time <library>..//Ice <library>..//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 <myth-models.h> -#include <boost/filesystem/path.hpp> +#include <filesystem> #include <Ice/ObjectAdapter.h> #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 : <library>..//dbppcore <library>..//adhocutil <define>ROOT=\"$(me)\" - <library>..//boost_system - <library>..//boost_filesystem + <library>..//stdc++fs <library>..//netfs-api <library>..//Ice <library>..//IceBox @@ -40,8 +39,7 @@ run fixtures/schema-min.sql : <define>BOOST_TEST_DYN_LINK - <library>..//boost_system - <library>..//boost_filesystem + <library>..//stdc++fs <library>testCommon <library>boost_utf <define>ROOT=\"$(me)\" |