Upgrade to Ice-3.7

8 files changed, 59 insertions, 64 deletions

diff --git a/netfs/daemon/Jamfile.jam b/netfs/daemon/Jamfile.jam
index af015a5..4669c66 100644
--- a/netfs/daemon/Jamfile.jam
+++ b/netfs/daemon/Jamfile.jam
@@ -7,8 +7,6 @@ lib netfsd-configuration :
 	<library>../ice//netfs-api
 	<implicit-dependency>../ice//netfs-api
 	<library>..//Ice
-	<library>..//IceUtil
-	<library>..//pthread
 	<library>..//boost_filesystem
 	<library>..//boost_system
 	<library>..//slicer
@@ -16,7 +14,6 @@ lib netfsd-configuration :
 	<slicer>yes
 	: :
 	<include>.
-	<library>..//IceUtil
 	<library>..//Ice
 	<library>..//boost_system
 	<library>..//slicer
@@ -25,7 +22,6 @@ lib netfsd-configuration :
 lib netfsd :
 	[ glob *.cpp : daemonConfigImpl.cpp ]
 	:
-	<define>_FILE_OFFSET_BITS=64
 	<implicit-dependency>../ice//netfs-api
 	<implicit-dependency>netfsd-configuration
 	<library>netfsd-configuration
@@ -36,7 +32,6 @@ lib netfsd :
 	<library>..//boost_filesystem
 	<library>..//boost_system
 	<library>..//Ice
-	<library>..//IceUtil
 	<library>..//IceBox
 	<library>..//adhocutil
 	<library>..//slicer-xml
diff --git a/netfs/daemon/daemon.cpp b/netfs/daemon/daemon.cpp
index 8ab7bfe..89843a4 100644
--- a/netfs/daemon/daemon.cpp
+++ b/netfs/daemon/daemon.cpp
@@ -40,21 +40,21 @@ NetFSDaemon::start(const std::string & name, const Ice::CommunicatorPtr & ic, co
 	LoadConfiguration(props->getProperty("NetFSD.ConfigPath"));
 
 	adapter = ic->createObjectAdapterWithEndpoints(name, dc->Self->Endpoint);
-	adapter->add(new ServiceServer(dc->CurrentConfiguration), ic->stringToIdentity("Service"));
+	adapter->add(std::make_shared<ServiceServer>(dc->CurrentConfiguration), Ice::stringToIdentity("Service"));
 	adapter->activate();
 }
 
 NetFS::Daemon::ConfigurationPtr
 NetFSDaemon::ReadConfiguration(const boost::filesystem::path & path) const
 {
-	auto s = Slicer::FileDeserializerFactory::createNew(path.extension().string(), path);
+	auto s = Slicer::DeserializerPtr(Slicer::FileDeserializerFactory::createNew(path.extension().string(), path));
 	return Slicer::DeserializeAnyWith<NetFS::Daemon::ConfigurationPtr>(s);
 }
 
 void
 NetFSDaemon::LoadConfiguration(const boost::filesystem::path & path)
 {
-	dc = new NetFS::Daemon::RuntimeConfiguration();
+	dc = std::make_shared<NetFS::Daemon::RuntimeConfiguration>();
 	dc->CurrentConfiguration = ReadConfiguration(path);
 	dc->Self = AdHoc::safeMapLookup<NetFS::Daemon::HostNotConfigured>(dc->CurrentConfiguration->Hosts, hostname());
 }
diff --git a/netfs/daemon/daemonFile.cpp b/netfs/daemon/daemonFile.cpp
index a4c903d..ceee92f 100644
--- a/netfs/daemon/daemonFile.cpp
+++ b/netfs/daemon/daemonFile.cpp
@@ -18,7 +18,7 @@ FileServer::~FileServer()
 }
 
 void
-FileServer::ftruncate(const NetFS::ReqEnv & re, Ice::Long size, const Ice::Current&)
+FileServer::ftruncate(NetFS::ReqEnv re, Ice::Long size, const Ice::Current&)
 {
 	(void)re;
 	errno = 0;
@@ -28,7 +28,7 @@ FileServer::ftruncate(const NetFS::ReqEnv & re, Ice::Long size, const Ice::Curre
 }
 
 NetFS::Attr
-FileServer::fgetattr(const NetFS::ReqEnv & re, const Ice::Current &)
+FileServer::fgetattr(NetFS::ReqEnv re, const Ice::Current &)
 {
 	(void)re;
 	struct stat s;
@@ -65,7 +65,7 @@ FileServer::read(Ice::Long offset, Ice::Long size, const Ice::Current&)
 }
 
 void
-FileServer::write(Ice::Long offset, Ice::Long size, const NetFS::Buffer & data, const Ice::Current&)
+FileServer::write(Ice::Long offset, Ice::Long size, NetFS::Buffer data, const Ice::Current&)
 {
 	errno = 0;
 	if (pwrite(fd, &data.front(), size, offset) != size) {
diff --git a/netfs/daemon/daemonFile.h b/netfs/daemon/daemonFile.h
index 5bf20f3..a53301c 100644
--- a/netfs/daemon/daemonFile.h
+++ b/netfs/daemon/daemonFile.h
@@ -10,11 +10,11 @@ class FileServer : public NetFS::File, EntryTypeConverter {
 		virtual ~FileServer();
 
 		virtual void close(const Ice::Current&) override;
-		virtual void ftruncate(const NetFS::ReqEnv &, Ice::Long size, const Ice::Current&) override;
-		virtual NetFS::Attr fgetattr(const NetFS::ReqEnv &, const Ice::Current&) override;
+		virtual void ftruncate(NetFS::ReqEnv, Ice::Long size, const Ice::Current&) override;
+		virtual NetFS::Attr fgetattr(NetFS::ReqEnv, const Ice::Current&) override;
 
 		virtual NetFS::Buffer read(Ice::Long offset, Ice::Long size, const Ice::Current&) override;
-		virtual void write(Ice::Long offset, Ice::Long size, const NetFS::Buffer & data, const Ice::Current&) override;
+		virtual void write(Ice::Long offset, Ice::Long size, NetFS::Buffer data, const Ice::Current&) override;
 
 	private:
 		const int fd;
diff --git a/netfs/daemon/daemonService.cpp b/netfs/daemon/daemonService.cpp
index 20082f1..ec21bac 100644
--- a/netfs/daemon/daemonService.cpp
+++ b/netfs/daemon/daemonService.cpp
@@ -8,14 +8,14 @@ ServiceServer::ServiceServer(NetFS::Daemon::ConfigurationPtr c) :
 {
 }
 
-NetFS::VolumePrx
-ServiceServer::connect(const std::string & share, const std::string & authtoken, const Ice::Current & ice)
+NetFS::VolumePrxPtr
+ServiceServer::connect(std::string share, std::string authtoken, const Ice::Current & ice)
 {
 	auto ex = AdHoc::safeMapLookup<NetFS::ExportNotFound>(config->Exports, share);
 	if (!ex->AuthToken.empty() && ex->AuthToken != authtoken) {
 		throw NetFS::AuthError();
 	}
-	return NetFS::VolumePrx::uncheckedCast(ice.adapter->addFacetWithUUID(
-				new VolumeServer(ex->RootPath, userLookup, groupLookup), "v01"));
+	return Ice::uncheckedCast<NetFS::VolumePrx>(ice.adapter->addFacetWithUUID(
+				std::make_shared<VolumeServer>(ex->RootPath, userLookup, groupLookup), "v01"));
 }
 
diff --git a/netfs/daemon/daemonService.h b/netfs/daemon/daemonService.h
index 09058b6..83684c8 100644
--- a/netfs/daemon/daemonService.h
+++ b/netfs/daemon/daemonService.h
@@ -10,7 +10,7 @@ class ServiceServer : public NetFS::Service {
 	public:
 		ServiceServer(NetFS::Daemon::ConfigurationPtr c);
 
-		virtual NetFS::VolumePrx connect(const std::string & share, const std::string & auth, const Ice::Current&) override;
+		virtual NetFS::VolumePrxPtr connect(std::string share, std::string auth, const Ice::Current&) override;
 
 	private:
 		EntCache<User> userLookup;
diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp
index e1295d6..e57c806 100644
--- a/netfs/daemon/daemonVolume.cpp
+++ b/netfs/daemon/daemonVolume.cpp
@@ -36,7 +36,7 @@ VolumeServer::disconnect(const Ice::Current & ice)
 }
 
 Ice::Int
-VolumeServer::access(const NetFS::ReqEnv & re, const std::string & path, Ice::Int mode, const Ice::Current &)
+VolumeServer::access(NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	struct stat s;
@@ -62,7 +62,7 @@ VolumeServer::access(const NetFS::ReqEnv & re, const std::string & path, Ice::In
 }
 
 NetFS::Attr
-VolumeServer::getattr(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current &)
+VolumeServer::getattr(NetFS::ReqEnv re, std::string path, const Ice::Current &)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	struct stat s;
@@ -75,7 +75,7 @@ VolumeServer::getattr(const NetFS::ReqEnv & re, const std::string & path, const
 }
 
 void
-VolumeServer::mknod(const NetFS::ReqEnv & re, const std::string & path, Ice::Int mode, Ice::Int dev, const Ice::Current&)
+VolumeServer::mknod(NetFS::ReqEnv re, std::string path, Ice::Int mode, Ice::Int dev, const Ice::Current&)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -87,7 +87,7 @@ VolumeServer::mknod(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
 }
 
 void
-VolumeServer::symlink(const NetFS::ReqEnv & re, const std::string & path1, const std::string & path2, const Ice::Current &)
+VolumeServer::symlink(NetFS::ReqEnv re, std::string path1, std::string path2, const Ice::Current &)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -103,7 +103,7 @@ VolumeServer::symlink(const NetFS::ReqEnv & re, const std::string & path1, const
 }
 
 void
-VolumeServer::link(const NetFS::ReqEnv & re, const std::string & path1, const std::string & path2, const Ice::Current &)
+VolumeServer::link(NetFS::ReqEnv re, std::string path1, std::string path2, const Ice::Current &)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -119,7 +119,7 @@ VolumeServer::link(const NetFS::ReqEnv & re, const std::string & path1, const st
 }
 
 void
-VolumeServer::rename(const NetFS::ReqEnv & re, const std::string & from, const std::string & to, const Ice::Current &)
+VolumeServer::rename(NetFS::ReqEnv re, std::string from, std::string to, const Ice::Current &)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -133,7 +133,7 @@ VolumeServer::rename(const NetFS::ReqEnv & re, const std::string & from, const s
 }
 
 std::string
-VolumeServer::readlink(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current &)
+VolumeServer::readlink(NetFS::ReqEnv re, std::string path, const Ice::Current &)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -148,7 +148,7 @@ VolumeServer::readlink(const NetFS::ReqEnv & re, const std::string & path, const
 }
 
 void
-VolumeServer::chmod(const NetFS::ReqEnv & re, const std::string & path, Ice::Int mode, const Ice::Current &)
+VolumeServer::chmod(NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current &)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -160,7 +160,7 @@ VolumeServer::chmod(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
 }
 
 void
-VolumeServer::chown(const NetFS::ReqEnv & re, const std::string & path, Ice::Int uid, Ice::Int gid, const Ice::Current &)
+VolumeServer::chown(NetFS::ReqEnv re, std::string path, Ice::Int uid, Ice::Int gid, const Ice::Current &)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -172,7 +172,7 @@ VolumeServer::chown(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
 }
 
 void
-VolumeServer::utimens(const NetFS::ReqEnv & re, const std::string & path,
+VolumeServer::utimens(NetFS::ReqEnv re, std::string path,
 		Ice::Long s0, Ice::Long ns0, Ice::Long s1, Ice::Long ns1, const Ice::Current&)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
@@ -190,7 +190,7 @@ VolumeServer::utimens(const NetFS::ReqEnv & re, const std::string & path,
 }
 
 NetFS::VFS
-VolumeServer::statfs(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current&)
+VolumeServer::statfs(NetFS::ReqEnv re, std::string path, const Ice::Current&)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -204,7 +204,7 @@ VolumeServer::statfs(const NetFS::ReqEnv & re, const std::string & path, const I
 }
 
 void
-VolumeServer::truncate(const NetFS::ReqEnv & re, const std::string & path, Ice::Long size, const Ice::Current&)
+VolumeServer::truncate(NetFS::ReqEnv re, std::string path, Ice::Long size, const Ice::Current&)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -216,7 +216,7 @@ VolumeServer::truncate(const NetFS::ReqEnv & re, const std::string & path, Ice::
 }
 
 void
-VolumeServer::unlink(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current&)
+VolumeServer::unlink(NetFS::ReqEnv re, std::string path, const Ice::Current&)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -227,8 +227,8 @@ VolumeServer::unlink(const NetFS::ReqEnv & re, const std::string & path, const I
 	}
 }
 
-NetFS::FilePrx
-VolumeServer::open(const NetFS::ReqEnv & re, const std::string & path, Ice::Int flags, const Ice::Current & ice)
+NetFS::FilePrxPtr
+VolumeServer::open(NetFS::ReqEnv re, std::string path, Ice::Int flags, const Ice::Current & ice)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -241,12 +241,12 @@ VolumeServer::open(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
 	if (fd == -1) {
 		throw NetFS::SystemError(errno);
 	}
-	return NetFS::FilePrx::uncheckedCast(ice.adapter->addFacetWithUUID(
-				new FileServer(fd, converter), "v01"));
+	return Ice::uncheckedCast<NetFS::FilePrx>(ice.adapter->addFacetWithUUID(
+				std::make_shared<FileServer>(fd, converter), "v01"));
 }
 
-NetFS::FilePrx
-VolumeServer::create(const NetFS::ReqEnv & re, const std::string & path, Ice::Int flags, Ice::Int mode, const Ice::Current & ice)
+NetFS::FilePrxPtr
+VolumeServer::create(NetFS::ReqEnv re, std::string path, Ice::Int flags, Ice::Int mode, const Ice::Current & ice)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -261,12 +261,12 @@ VolumeServer::create(const NetFS::ReqEnv & re, const std::string & path, Ice::In
 		::unlink(p.c_str());
 		throw NetFS::SystemError(errno);
 	}
-	return NetFS::FilePrx::uncheckedCast(ice.adapter->addFacetWithUUID(
-				new FileServer(fd, converter), "v01"));
+	return Ice::uncheckedCast<NetFS::FilePrx>(ice.adapter->addFacetWithUUID(
+				std::make_shared<FileServer>(fd, converter), "v01"));
 }
 
-NetFS::DirectoryPrx
-VolumeServer::opendir(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current & ice)
+NetFS::DirectoryPrxPtr
+VolumeServer::opendir(NetFS::ReqEnv re, std::string path, const Ice::Current & ice)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -276,12 +276,12 @@ VolumeServer::opendir(const NetFS::ReqEnv & re, const std::string & path, const
 	if (!od) {
 		throw NetFS::SystemError(errno);
 	}
-	return NetFS::DirectoryPrx::uncheckedCast(ice.adapter->addFacetWithUUID(
-				new DirectoryServer(od, converter), "v02"));
+	return Ice::uncheckedCast<NetFS::DirectoryPrx>(ice.adapter->addFacetWithUUID(
+				std::make_shared<DirectoryServer>(od, converter), "v02"));
 }
 
 void
-VolumeServer::mkdir(const NetFS::ReqEnv & re, const std::string & path, Ice::Int mode, const Ice::Current&)
+VolumeServer::mkdir(NetFS::ReqEnv re, std::string path, Ice::Int mode, const Ice::Current&)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
@@ -297,7 +297,7 @@ VolumeServer::mkdir(const NetFS::ReqEnv & re, const std::string & path, Ice::Int
 }
 
 void
-VolumeServer::rmdir(const NetFS::ReqEnv & re, const std::string & path, const Ice::Current&)
+VolumeServer::rmdir(NetFS::ReqEnv re, std::string path, const Ice::Current&)
 {
 	ModeCheck mc(re, root, userLookup, groupLookup);
 	errno = 0;
diff --git a/netfs/daemon/daemonVolume.h b/netfs/daemon/daemonVolume.h
index af0e36d..7c27821 100644
--- a/netfs/daemon/daemonVolume.h
+++ b/netfs/daemon/daemonVolume.h
@@ -12,30 +12,30 @@ class VolumeServer : public NetFS::Volume {
 		VolumeServer(const boost::filesystem::path & root, const EntCache<User> &, const EntCache<Group> &);
 		virtual ~VolumeServer();
 
-		virtual NetFS::DirectoryPrx opendir(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override;
+		virtual NetFS::DirectoryPrxPtr opendir(NetFS::ReqEnv, std::string path, const Ice::Current&) override;
 
-		virtual void mkdir(const NetFS::ReqEnv &, const std::string & path, Ice::Int id, const Ice::Current&) override;
-		virtual void rmdir(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override;
+		virtual void mkdir(NetFS::ReqEnv, std::string path, Ice::Int id, const Ice::Current&) override;
+		virtual void rmdir(NetFS::ReqEnv, std::string path, const Ice::Current&) override;
 
-		virtual void truncate(const NetFS::ReqEnv &, const std::string & path, Ice::Long size, const Ice::Current&) override;
+		virtual void truncate(NetFS::ReqEnv, std::string path, Ice::Long size, const Ice::Current&) override;
 
-		virtual void unlink(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override;
+		virtual void unlink(NetFS::ReqEnv, std::string path, const Ice::Current&) override;
 
-		virtual NetFS::FilePrx open(const NetFS::ReqEnv &, const std::string & path, Ice::Int flags, const Ice::Current&) override;
-		virtual NetFS::FilePrx create(const NetFS::ReqEnv &, const std::string & path, Ice::Int flags, Ice::Int mode, const Ice::Current&) override;
+		virtual NetFS::FilePrxPtr open(NetFS::ReqEnv, std::string path, Ice::Int flags, const Ice::Current&) override;
+		virtual NetFS::FilePrxPtr create(NetFS::ReqEnv, std::string path, Ice::Int flags, Ice::Int mode, const Ice::Current&) override;
 
-		virtual NetFS::VFS statfs(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override;
+		virtual NetFS::VFS statfs(NetFS::ReqEnv, std::string path, const Ice::Current&) override;
 
-		virtual Ice::Int access(const NetFS::ReqEnv &, const std::string & path, Ice::Int mode, const Ice::Current&) override;
-		virtual NetFS::Attr getattr(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override;
-		virtual void mknod(const NetFS::ReqEnv &, const std::string & path, Ice::Int mode, Ice::Int dev, const Ice::Current&) override;
-		virtual void symlink(const NetFS::ReqEnv &, const std::string & path1, const std::string & path2, const Ice::Current&) override;
-		virtual void link(const NetFS::ReqEnv &, const std::string & path1, const std::string & path2, const Ice::Current&) override;
-		virtual void rename(const NetFS::ReqEnv &, const std::string & path1, const std::string & path2, const Ice::Current&) override;
-		virtual std::string readlink(const NetFS::ReqEnv &, const std::string & path, const Ice::Current&) override;
-		virtual void chmod(const NetFS::ReqEnv &, const std::string & path, Ice::Int mode, const Ice::Current&) override;
-		virtual void chown(const NetFS::ReqEnv &, const std::string & path, Ice::Int uid, Ice::Int gid, const Ice::Current&) override;
-		virtual void utimens(const NetFS::ReqEnv &, const std::string & path, Ice::Long, Ice::Long, Ice::Long, Ice::Long, const Ice::Current&) override;
+		virtual Ice::Int access(NetFS::ReqEnv, std::string path, Ice::Int mode, const Ice::Current&) override;
+		virtual NetFS::Attr getattr(NetFS::ReqEnv, std::string path, const Ice::Current&) override;
+		virtual void mknod(NetFS::ReqEnv, std::string path, Ice::Int mode, Ice::Int dev, const Ice::Current&) override;
+		virtual void symlink(NetFS::ReqEnv, std::string path1, std::string path2, const Ice::Current&) override;
+		virtual void link(NetFS::ReqEnv, std::string path1, std::string path2, const Ice::Current&) override;
+		virtual void rename(NetFS::ReqEnv, std::string path1, std::string path2, const Ice::Current&) override;
+		virtual std::string readlink(NetFS::ReqEnv, std::string path, const Ice::Current&) override;
+		virtual void chmod(NetFS::ReqEnv, std::string path, Ice::Int mode, const Ice::Current&) override;
+		virtual void chown(NetFS::ReqEnv, std::string path, Ice::Int uid, Ice::Int gid, const Ice::Current&) override;
+		virtual void utimens(NetFS::ReqEnv, std::string path, Ice::Long, Ice::Long, Ice::Long, Ice::Long, const Ice::Current&) override;
 
 		virtual void disconnect(const Ice::Current&) override;