summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dir.h2
-rw-r--r--src/repo.cpp4
-rw-r--r--src/repo.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/dir.h b/src/dir.h
index 51b4bc7..e8a29df 100644
--- a/src/dir.h
+++ b/src/dir.h
@@ -7,7 +7,7 @@
namespace GitFS {
using namespace NetFS;
class Repo;
- class Directory : public DirectoryV2 {
+ class Directory : public NetFS::Directory {
public:
Directory(Repo * const r, std::string &&);
diff --git a/src/repo.cpp b/src/repo.cpp
index 51f5fd1..9bf156a 100644
--- a/src/repo.cpp
+++ b/src/repo.cpp
@@ -52,7 +52,7 @@ GitFS::Repo::opendir(ReqEnv, ::std::string path, const ::Ice::Current& ice)
throw NetFS::SystemError(EINVAL);
}
- return Ice::uncheckedCast<NetFS::DirectoryV2Prx>(ice.adapter->addWithUUID(
+ return Ice::uncheckedCast<NetFS::DirectoryPrx>(ice.adapter->addWithUUID(
std::make_shared<Directory>(this, std::move(path))));
}
@@ -225,7 +225,7 @@ GitFS::Repo::link(ReqEnv, ::std::string, ::std::string, const ::Ice::Current&)
void
-GitFS::Repo::rename(ReqEnv, ::std::string, ::std::string, const ::Ice::Current&)
+GitFS::Repo::rename(ReqEnv, ::std::string, ::std::string, const Ice::optional<Ice::Int>, const ::Ice::Current&)
{
throw NetFS::SystemError(EROFS);
}
diff --git a/src/repo.h b/src/repo.h
index b5b183c..34e5826 100644
--- a/src/repo.h
+++ b/src/repo.h
@@ -27,7 +27,7 @@ namespace GitFS {
void mknod(ReqEnv env, ::std::string path, int mode, int dev, const ::Ice::Current& current) override;
void symlink(ReqEnv env, ::std::string path1, ::std::string path2, const ::Ice::Current& current) override;
void link(ReqEnv env, ::std::string path1, ::std::string path2, const ::Ice::Current& current) override;
- void rename(ReqEnv env, ::std::string from, ::std::string to, const ::Ice::Current& current) override;
+ void rename(ReqEnv env, ::std::string from, ::std::string to, const Ice::optional<Ice::Int>, const ::Ice::Current& current) override;
void chmod(ReqEnv env, ::std::string path, int mode, const ::Ice::Current& current) override;
void chown(ReqEnv env, ::std::string path, int uid, int gid, const ::Ice::Current& current) override;
void utimens(ReqEnv env, ::std::string path, long long int atime, long long int atimens, long long int mtime, long long int mtimens, const ::Ice::Current& current) override;