commit ab1e8f24978f1cb5b06cdb180697ee449890d90a
author Davide Pesavento <davide.pesavento@lip6.fr> Tue Oct 21 22:45:33 2014 +0200
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Oct 29 23:53:23 2014 -0700
tree 5ba2567e9873327b6499ba8da4b37ee0357fd474
parent 35eefdfa1a9ac389915c5ebc55f0ef0a6addd371

build: Always build in C++11 mode.

This commit also includes update of websocketpp submodule, as the
previous version has compilation problems on OSX with XCode 6.1

Change-Id: I8c9670d0026d840838d77e610e50679ee5ede7a5
Refs: #1930, #2082

daemon/face/face.cpp

diff --git a/daemon/face/face.cpp b/daemon/face/face.cpp
index f3757ff..7d3c1b7 100644
--- a/daemon/face/face.cpp
+++ b/daemon/face/face.cpp
@@ -36,10 +36,10 @@
   , m_isOnDemand(false)
   , m_isFailed(false)
 {
-  onReceiveInterest += bind(&PacketCounter::operator++, &m_counters.getNInInterests());
-  onReceiveData     += bind(&PacketCounter::operator++, &m_counters.getNInDatas());
-  onSendInterest    += bind(&PacketCounter::operator++, &m_counters.getNOutInterests());
-  onSendData        += bind(&PacketCounter::operator++, &m_counters.getNOutDatas());
+  onReceiveInterest += [this](const ndn::Interest&) { ++m_counters.getNInInterests(); };
+  onReceiveData     += [this](const ndn::Data&) {     ++m_counters.getNInDatas(); };
+  onSendInterest    += [this](const ndn::Interest&) { ++m_counters.getNOutInterests(); };
+  onSendData        += [this](const ndn::Data&) {     ++m_counters.getNOutDatas(); };
 }
 
 Face::~Face()

daemon/face/websocket-channel.cpp

diff --git a/daemon/face/websocket-channel.cpp b/daemon/face/websocket-channel.cpp
index d6cf64b..a16ee64 100644
--- a/daemon/face/websocket-channel.cpp
+++ b/daemon/face/websocket-channel.cpp
@@ -115,8 +115,8 @@
       websocketpp::lib::error_code ecode;
       m_server.close(hdl, websocketpp::close::status::normal, "closed by channel", ecode);
     }
-  shared_ptr<WebSocketFace> face = make_shared<WebSocketFace>(FaceUri(remote), this->getUri(),
-                                                              hdl, ref(m_server));
+  shared_ptr<WebSocketFace> face = ndn::make_shared<WebSocketFace>(FaceUri(remote), this->getUri(),
+                                                                   hdl, ref(m_server));
   m_onFaceCreatedCallback(face);
   m_channelFaces[hdl] = face;