From 351984640ce700a273cf317344e5ef32786985ef Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Sat, 7 Sep 2013 13:54:54 +0000
Subject: Explicit daemon destruction in order Client linking fix

---
 project2/daemon/lib/Jamfile.jam       | 1 +
 project2/daemon/p2daemonAppEngine.cpp | 5 +++++
 project2/daemon/p2daemonAppEngine.h   | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/project2/daemon/lib/Jamfile.jam b/project2/daemon/lib/Jamfile.jam
index e028f19..c46ff32 100644
--- a/project2/daemon/lib/Jamfile.jam
+++ b/project2/daemon/lib/Jamfile.jam
@@ -10,6 +10,7 @@ lib p2daemonlib :
 	<library>../../common//p2common
 	: :
 	<include>.
+	<library>../../common//p2common
 	;
 
 
diff --git a/project2/daemon/p2daemonAppEngine.cpp b/project2/daemon/p2daemonAppEngine.cpp
index d00cd1d..cb414c5 100644
--- a/project2/daemon/p2daemonAppEngine.cpp
+++ b/project2/daemon/p2daemonAppEngine.cpp
@@ -19,6 +19,11 @@ DaemonAppEngine::DaemonAppEngine(int argc, char ** argv) :
 	daemon = DaemonLoader::createNew(daemonType, argc, argv);
 }
 
+DaemonAppEngine::~DaemonAppEngine()
+{
+	daemon.reset();
+}
+
 void
 DaemonAppEngine::shutdown(int)
 {
diff --git a/project2/daemon/p2daemonAppEngine.h b/project2/daemon/p2daemonAppEngine.h
index 48ef572..236bef6 100644
--- a/project2/daemon/p2daemonAppEngine.h
+++ b/project2/daemon/p2daemonAppEngine.h
@@ -8,7 +8,7 @@
 class DaemonAppEngine {
 	public:
 		DaemonAppEngine(int, char **);
-		~DaemonAppEngine() = default;
+		~DaemonAppEngine();
 
 		void process() const;
 
-- 
cgit v1.2.3