commit 85d60ebaa89fb0a28cad336ff8576fb067847291
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Sep 08 14:30:05 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Sep 10 13:15:02 2016 -0700
tree 3590ff164a0fbd33344d2eff86bcbdd0d3642caa
parent 5f3f6343a943d8cacbf6fc3c1287522c23ea18a0

[ndnSIM] Fix circular dependency for shared_ptr<Face>

This patch not needed for NFD-0.5.0+

Change-Id: I6c20fe06cf41a7437579d8b5a5a9b8d51293a86e

daemon/fw/face-table.cpp

diff --git a/daemon/fw/face-table.cpp b/daemon/fw/face-table.cpp
index b4bda23..6c50049 100644
--- a/daemon/fw/face-table.cpp
+++ b/daemon/fw/face-table.cpp
@@ -90,7 +90,14 @@
   face->afterReceiveInterest.connect(bind(&Forwarder::startProcessInterest, &m_forwarder, ref(*face), _1));
   face->afterReceiveData.connect(bind(&Forwarder::startProcessData, &m_forwarder, ref(*face), _1));
   face->afterReceiveNack.connect(bind(&Forwarder::startProcessNack, &m_forwarder, ref(*face), _1));
-  connectFaceClosedSignal(*face, bind(&FaceTable::remove, this, face));
+
+  std::weak_ptr<Face> weakFace = face;
+  connectFaceClosedSignal(*face, [this, weakFace] {
+      shared_ptr<Face> face = weakFace.lock();
+      if (face != nullptr) {
+        this->remove(face);
+      }
+    });
 
   this->afterAdd(face);
 }