6 files changed, 7 insertions, 7 deletions
diff --git a/mythfs/service/inodes/allDirectory.cpp b/mythfs/service/inodes/allDirectory.cpp
index d7278a3..f9bea8c 100644
--- a/mythfs/service/inodes/allDirectory.cpp
+++ b/mythfs/service/inodes/allDirectory.cpp
@@ -21,7 +21,7 @@ namespace MythFS {
 				}) == rs.end()) {
 			throw NetFS::SystemError(ENOENT);
 		}
-		return new Symlink("/var/store/mythrecordings/" + path);
+		return std::make_shared<Symlink>("/var/store/mythrecordings/" + path);
 	}
 }
 
diff --git a/mythfs/service/inodes/filterByDateDirectory.cpp b/mythfs/service/inodes/filterByDateDirectory.cpp
index 53298e9..2fceb64 100644
--- a/mythfs/service/inodes/filterByDateDirectory.cpp
+++ b/mythfs/service/inodes/filterByDateDirectory.cpp
@@ -28,7 +28,7 @@ namespace MythFS {
 	{
 		for (auto r :db->getRecorded()) {
 			if (matches(r) && attribute(r) == n) {
-				return new Symlink("/var/store/mythrecordings/" + r->basename);
+				return std::make_shared<Symlink>("/var/store/mythrecordings/" + r->basename);
 			}
 		}
 		throw NetFS::SystemError(ENOENT);
diff --git a/mythfs/service/inodes/filterByTitleDirectory.cpp b/mythfs/service/inodes/filterByTitleDirectory.cpp
index 3d8f4bd..2c3a373 100644
--- a/mythfs/service/inodes/filterByTitleDirectory.cpp
+++ b/mythfs/service/inodes/filterByTitleDirectory.cpp
@@ -27,7 +27,7 @@ namespace MythFS {
 	{
 		for (auto r :db->getRecorded()) {
 			if (matches(r) && attribute(r) == n) {
-				return new Symlink("/var/store/mythrecordings/" + r->basename);
+				return std::make_shared<Symlink>("/var/store/mythrecordings/" + r->basename);
 			}
 		}
 		throw NetFS::SystemError(ENOENT);
diff --git a/mythfs/service/inodes/groupingByDateDirectory.cpp b/mythfs/service/inodes/groupingByDateDirectory.cpp
index 6aa842e..047488c 100644
--- a/mythfs/service/inodes/groupingByDateDirectory.cpp
+++ b/mythfs/service/inodes/groupingByDateDirectory.cpp
@@ -21,7 +21,7 @@ namespace MythFS {
 		if (!AdHoc::containerContains(getContents(), t)) {
 			throw NetFS::SystemError(ENOENT);
 		}
-		return new FilterByDateDirectory(db, t);
+		return std::make_shared<FilterByDateDirectory>(db, t);
 	}
 }
 
diff --git a/mythfs/service/inodes/groupingByTitleDirectory.cpp b/mythfs/service/inodes/groupingByTitleDirectory.cpp
index a87687c..edd5225 100644
--- a/mythfs/service/inodes/groupingByTitleDirectory.cpp
+++ b/mythfs/service/inodes/groupingByTitleDirectory.cpp
@@ -21,7 +21,7 @@ namespace MythFS {
 		if (!AdHoc::containerContains(getContents(), t)) {
 			throw NetFS::SystemError(ENOENT);
 		}
-		return new FilterByTitleDirectory(db, t);
+		return std::make_shared<FilterByTitleDirectory>(db, t);
 	}
 }
 
diff --git a/mythfs/service/inodes/node.h b/mythfs/service/inodes/node.h
index b88e403..4497857 100644
--- a/mythfs/service/inodes/node.h
+++ b/mythfs/service/inodes/node.h
@@ -10,11 +10,11 @@
 namespace MythFS {
 	class Node;
 
-	typedef std::map<std::string, IceUtil::Handle<Node>> Contents;
+	typedef std::map<std::string, std::shared_ptr<Node>> Contents;
 
 	class Node : public virtual Ice::Object {
 		public:
-			typedef IceUtil::Handle<Node> PointerType;
+			typedef std::shared_ptr<Node> PointerType;
 
 			virtual NetFS::Attr getattr() const = 0;
 			virtual std::string readlink() const;