diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-02-03 01:47:15 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-02-03 01:54:12 +0000 |
| commit | b6d99e9e74c2f74513855ffac4564b0878a83273 (patch) | |
| tree | c905a94914a1f1650e5fe67bf5c618bfdb68c9e4 /netfs/fuse | |
| parent | Add missing explicit on install targets (diff) | |
| download | netfs-b6d99e9e74c2f74513855ffac4564b0878a83273.tar.bz2 netfs-b6d99e9e74c2f74513855ffac4564b0878a83273.tar.xz netfs-b6d99e9e74c2f74513855ffac4564b0878a83273.zip | |
Remove boost::filesystem in favour of std::filesystem
Diffstat (limited to 'netfs/fuse')
| -rw-r--r-- | netfs/fuse/Jamfile.jam | 4 | ||||
| -rw-r--r-- | netfs/fuse/fuseApp.cpp | 2 | ||||
| -rw-r--r-- | netfs/fuse/fuseApp.h | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/netfs/fuse/Jamfile.jam b/netfs/fuse/Jamfile.jam index 67a0600..6972e3f 100644 --- a/netfs/fuse/Jamfile.jam +++ b/netfs/fuse/Jamfile.jam @@ -15,7 +15,6 @@ lib netfs-client-configuration : <library>..//adhocutil : : <library>..//Ice - <library>..//boost_system <library>..//slicer ; @@ -28,8 +27,7 @@ lib netfs-client : <implicit-dependency>netfs-client-configuration <library>../ice//netfs-api <library>../lib//netfs-common - <library>..//boost_system - <library>..//boost_filesystem + <library>..//stdc++fs <library>..//Ice <library>Glacier2 <library>..//slicer diff --git a/netfs/fuse/fuseApp.cpp b/netfs/fuse/fuseApp.cpp index 6064e67..79fa0dd 100644 --- a/netfs/fuse/fuseApp.cpp +++ b/netfs/fuse/fuseApp.cpp @@ -66,7 +66,7 @@ NetFS::FuseApp::~FuseApp() } NetFS::Client::ConfigurationPtr -NetFS::FuseApp::ReadConfiguration(const boost::filesystem::path & path) const +NetFS::FuseApp::ReadConfiguration(const std::filesystem::path & path) const { auto s = Slicer::FileDeserializerFactory::createNew(path.extension().string(), path); return Slicer::DeserializeAnyWith<NetFS::Client::ConfigurationPtr>(s); diff --git a/netfs/fuse/fuseApp.h b/netfs/fuse/fuseApp.h index f37acb7..23738b3 100644 --- a/netfs/fuse/fuseApp.h +++ b/netfs/fuse/fuseApp.h @@ -3,7 +3,7 @@ #include <shared_mutex> #include <functional> -#include <boost/filesystem/path.hpp> +#include <filesystem> #include <Ice/Ice.h> #include <Glacier2/Session.h> #include <service.h> @@ -102,7 +102,7 @@ namespace NetFS { protected: typedef std::function<Client::ResourcePtr()> Configurator; Configurator configurator; - virtual NetFS::Client::ConfigurationPtr ReadConfiguration(const boost::filesystem::path &) const; + virtual NetFS::Client::ConfigurationPtr ReadConfiguration(const std::filesystem::path &) const; virtual NetFS::Client::ResourcePtr configureFromFile(const std::string &, const std::string &) const; virtual NetFS::Client::ResourcePtr configureFromUri(const std::string &) const; |