diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-01-18 21:41:57 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2016-01-18 21:41:57 +0000 |
| commit | c4e834a8a7801e9bddca15807f09fe73673e26e8 (patch) | |
| tree | 6b56e8a7d7e9e31e1738fc16a97abd91b22b9f87 | |
| parent | Use path's own c_str, no need to string it first (diff) | |
| download | netfs-c4e834a8a7801e9bddca15807f09fe73673e26e8.tar.bz2 netfs-c4e834a8a7801e9bddca15807f09fe73673e26e8.tar.xz netfs-c4e834a8a7801e9bddca15807f09fe73673e26e8.zip | |
Remove straggling use of Slicer::Deserialize in favour of more flexible DeserializeAny
| -rw-r--r-- | netfs/daemon/daemon.cpp | 2 | ||||
| -rw-r--r-- | netfs/fuse/fuseApp.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/netfs/daemon/daemon.cpp b/netfs/daemon/daemon.cpp index 9e8a60a..4db21cb 100644 --- a/netfs/daemon/daemon.cpp +++ b/netfs/daemon/daemon.cpp @@ -47,7 +47,7 @@ NetFSDaemon::start(const std::string & name, const Ice::CommunicatorPtr & ic, co NetFS::Daemon::ConfigurationPtr NetFSDaemon::ReadConfiguration(const boost::filesystem::path & path) const { - return Slicer::Deserialize<Slicer::XmlFileDeserializer, NetFS::Daemon::Configuration>(path); + return Slicer::DeserializeAny<Slicer::XmlFileDeserializer, NetFS::Daemon::ConfigurationPtr>(path); } void diff --git a/netfs/fuse/fuseApp.cpp b/netfs/fuse/fuseApp.cpp index d05bcc0..cd55574 100644 --- a/netfs/fuse/fuseApp.cpp +++ b/netfs/fuse/fuseApp.cpp @@ -63,7 +63,7 @@ NetFS::FuseApp::~FuseApp() NetFS::Client::ConfigurationPtr NetFS::FuseApp::ReadConfiguration(const std::string & path) const { - return Slicer::Deserialize<Slicer::XmlFileDeserializer, NetFS::Client::Configuration>(path); + return Slicer::DeserializeAny<Slicer::XmlFileDeserializer, NetFS::Client::ConfigurationPtr>(path); } void * |