Commit more work to date

1 files changed, 13 insertions, 11 deletions

diff --git a/netfs/daemonConfig.h b/netfs/daemonConfig.h
index 223436c..a27f686 100644
--- a/netfs/daemonConfig.h
+++ b/netfs/daemonConfig.h
@@ -4,12 +4,14 @@
 #include <string>
 #include <map>
 #include <set>
-#include "smartpointer.h"
+#include <intrusivePtrBase.h>
+#include <boost/intrusive_ptr.hpp>
+#include <boost/filesystem/path.hpp>
 #include "xml.h"
 
-class DaemonConfig : public virtual IsRefCounted {
+class DaemonConfig : public virtual IntrusivePtrBase {
 	public:
-		class Host : public virtual IsRefCounted {
+		class Host : public virtual IntrusivePtrBase {
 			public:
 				Host(xmlNodePtr);
 
@@ -17,30 +19,30 @@ class DaemonConfig : public virtual IsRefCounted {
 				std::string		name;
 				bool			self;
 		};
-		typedef SmartPointer<Host> HostPtr;
+		typedef boost::intrusive_ptr<Host> HostPtr;
 		typedef std::map<std::string, HostPtr> HostMap;
 		typedef std::set<HostPtr> HostSet;
 
-		class Export : public virtual IsRefCounted {
+		class Export : public virtual IntrusivePtrBase {
 			public:
 				Export(xmlNodePtr, const HostMap &);
 
-				std::string		root;
-				std::string		name;
-				HostSet			replicate;
+				boost::filesystem::path root;
+				std::string name;
+				HostSet replicate;
 		};
-		typedef SmartPointer<Export> ExportPtr;
+		typedef boost::intrusive_ptr<Export> ExportPtr;
 		typedef std::map<std::string, ExportPtr> ExportMap;
 
 		DaemonConfig(xmlNodePtr);
-		static SmartPointer<DaemonConfig>	Load(const char * path);
+		static boost::intrusive_ptr<DaemonConfig>	Load(const char * path);
 
 
 		ExportMap		exports;
 		HostMap			hosts;
 		HostPtr			self;
 };
-typedef SmartPointer<DaemonConfig> DaemonConfigPtr;
+typedef boost::intrusive_ptr<DaemonConfig> DaemonConfigPtr;
 
 #endif