commit 7c8882ffac6dd1a4ae516212c0bde838d60b9280
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Oct 28 12:12:15 2014 -0700
committer Vince Lehman <vslehman@memphis.edu> Wed Oct 29 14:11:45 2014 -0700
tree 23fca22cc5f6639bab5ebfaf53745071ce8e8779
parent 1cf1e103895764d8b153fb9ba658a9a4ad142204

sync: Avoid use of boost::serialization::null_deleter

Refs: #2072

Change-Id: Ie860c2d09d38025750be056d03d71b5de58f1c5b

src/communication/sync-logic-handler.cpp

diff --git a/src/communication/sync-logic-handler.cpp b/src/communication/sync-logic-handler.cpp
index c0638c7..8e679ba 100644
--- a/src/communication/sync-logic-handler.cpp
+++ b/src/communication/sync-logic-handler.cpp
@@ -29,10 +29,6 @@
 #include "sequencing-manager.hpp"
 #include "utility/name-helper.hpp"
 
-#include <boost/serialization/shared_ptr.hpp>
-
-using namespace boost::serialization;
-
 namespace nlsr {
 
 INIT_LOGGER("SyncLogicHandler");
@@ -124,6 +120,17 @@
 const std::string SyncLogicHandler::ADJACENCY_COMPONENT = "adjacency";
 const std::string SyncLogicHandler::COORDINATE_COMPONENT = "coordinate";
 
+
+template<class T>
+class NullDeleter
+{
+public:
+  void
+  operator()(T*)
+  {
+  }
+};
+
 void
 SyncLogicHandler::createSyncSocket()
 {
@@ -131,7 +138,7 @@
 
   // The face's lifetime is managed in main.cpp; SyncSocket should not manage the memory
   // of the object
-  ndn::shared_ptr<ndn::Face> facePtr(&m_syncFace, null_deleter());
+  ndn::shared_ptr<ndn::Face> facePtr(&m_syncFace, NullDeleter<ndn::Face>());
 
   m_syncSocket = ndn::make_shared<Sync::SyncSocket>(m_syncPrefix, m_validator, facePtr,
                                                     ndn::bind(&SyncLogicHandler::onNsyncUpdate,