commit c9eb68f81899a9c94c5ed78991eae6015b0e2c8d
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 07 13:40:00 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 07 13:40:00 2013 -0800
tree 385dc3c2e49d51c03002bfe0660e9e8fcb9b3bb8
parent 8224bb624ab780a22a3f0a0d8cbc9fe65dc0a868

Extending ccnx-name and fixing bug with toString

daemon/daemon.cc

diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index 5b953d3..ae41418 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -23,6 +23,7 @@
 #include <iostream>
 #include <Ice/Service.h>
 #include <Ice/Identity.h>
+#include <ccnx-wrapper.h>
 
 #include "notify-i.h"
 #include <boost/make_shared.hpp>
@@ -30,6 +31,7 @@
 using namespace std;
 using namespace boost;
 using namespace ChronoshareClient;
+using namespace Ccnx;
 
 typedef boost::error_info<struct tag_errmsg, std::string> errmsg_info_str; 
 
@@ -70,7 +72,8 @@
   try
     {
       // DbHelper db ("./", "/ndn/ucla.edu/alex");
-      ActionLogPtr actionLog = make_shared<ActionLog> ("./", "/ndn/ucla.edu/alex");
+      CcnxWrapperPtr ccnx = make_shared<CcnxWrapper> ();
+      ActionLogPtr actionLog = make_shared<ActionLog> (ccnx, "./", "/ndn/ucla.edu/alex", "shared");
 
       MyService svc (actionLog);
       status = svc.main (argc, argv);