diff options
| author | randomdan <randomdan@localhost> | 2014-09-27 12:42:04 +0000 |
|---|---|---|
| committer | randomdan <randomdan@localhost> | 2014-09-27 12:42:04 +0000 |
| commit | 350c6d243fcd1cd7b025d000940d1ce2784f022d (patch) | |
| tree | 6ee6365103388084e771a85aa16187f352973ed7 | |
| parent | Match the new Slicer interface (diff) | |
| download | netfs-350c6d243fcd1cd7b025d000940d1ce2784f022d.tar.bz2 netfs-350c6d243fcd1cd7b025d000940d1ce2784f022d.tar.xz netfs-350c6d243fcd1cd7b025d000940d1ce2784f022d.zip | |
Slicer compat fixnetfs-1.0.1
| -rw-r--r-- | netfs/daemon/daemon.cpp | 2 | ||||
| -rw-r--r-- | netfs/fuse/fuse.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/netfs/daemon/daemon.cpp b/netfs/daemon/daemon.cpp index 14dd26b..4611d30 100644 --- a/netfs/daemon/daemon.cpp +++ b/netfs/daemon/daemon.cpp @@ -34,7 +34,7 @@ void NetFSDaemon::LoadConfiguration(const boost::filesystem::path & path) { dc = new NetFS::Daemon::RuntimeConfiguration(); - dc->CurrentConfiguration = Slicer::Deserialize<Slicer::XmlFile, NetFS::Daemon::Configuration>(path); + dc->CurrentConfiguration = Slicer::Deserialize<Slicer::XmlFileDeserializer, NetFS::Daemon::Configuration>(path); auto selfItr = dc->CurrentConfiguration->Hosts.find(hostname()); if (selfItr == dc->CurrentConfiguration->Hosts.end()) { throw std::runtime_error("This host is not defined in the configuration."); diff --git a/netfs/fuse/fuse.cpp b/netfs/fuse/fuse.cpp index ac0d0d7..ceb1515 100644 --- a/netfs/fuse/fuse.cpp +++ b/netfs/fuse/fuse.cpp @@ -37,7 +37,7 @@ void * NetFS::FuseApp::init(struct fuse_conn_info *) { ic = Ice::initialize(_argc, _argv); - fc = Slicer::Deserialize<Slicer::XmlFile, NetFS::Client::Configuration>(configPath); + fc = Slicer::Deserialize<Slicer::XmlFileDeserializer, NetFS::Client::Configuration>(configPath); return NULL; } |