diff options
| -rw-r--r-- | src/dir.h | 2 | ||||
| -rw-r--r-- | src/repo.cpp | 4 | ||||
| -rw-r--r-- | src/repo.h | 2 | ||||
| -rw-r--r-- | unittests/config.cpp | 3 | ||||
| -rw-r--r-- | unittests/core.cpp | 6 |
5 files changed, 7 insertions, 10 deletions
@@ -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); } @@ -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; diff --git a/unittests/config.cpp b/unittests/config.cpp index 460a35f..db7570e 100644 --- a/unittests/config.cpp +++ b/unittests/config.cpp @@ -75,8 +75,7 @@ BOOST_DATA_TEST_CASE(uid_gid_override_list, BOOST_CHECK_NO_THROW(c.s->ice_ping()); auto dir = c.v->opendir(c.env, path); - auto dir2 = Ice::checkedCast<NetFS::DirectoryV2Prx>(dir); - for (const auto & dirent : dir2->listdir()) { + for (const auto & dirent : dir->listdir()) { BOOST_TEST_CONTEXT(dirent.first) { BOOST_CHECK_EQUAL(dirent.second.uid, uid); BOOST_CHECK_EQUAL(dirent.second.gid, gid); diff --git a/unittests/core.cpp b/unittests/core.cpp index 6eef46a..ba25e88 100644 --- a/unittests/core.cpp +++ b/unittests/core.cpp @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE( unsupported_rofs_ops ) BOOST_CHECK_THROW_SYSTEMERROR(v->mknod(env, {}, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->symlink(env, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->link(env, {}, {}), EROFS); - BOOST_CHECK_THROW_SYSTEMERROR(v->rename(env, {}, {}), EROFS); + BOOST_CHECK_THROW_SYSTEMERROR(v->rename(env, {}, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->chmod(env, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->chown(env, {}, {}, {}), EROFS); BOOST_CHECK_THROW_SYSTEMERROR(v->utimens(env, {}, {}, {}, {}, {}), EROFS); @@ -251,9 +251,7 @@ BOOST_DATA_TEST_CASE( openDirList, DIRPATHS ^ DIRCONTENTMODES, path, contents ) { auto dir = v->opendir(env, path); BOOST_REQUIRE(dir); - auto dir2 = Ice::checkedCast<NetFS::DirectoryV2Prx>(dir); - BOOST_REQUIRE(dir2); - auto list = dir2->listdir(); + auto list = dir->listdir(); BOOST_REQUIRE_EQUAL(contents.size(), list.size()); for (const auto & c : contents) { auto li = list.find(std::get<0>(c)); |