commit a6bd7da5592cdd535cee66d5ca9a1c4e46270181
author Alexander Afanasyev <aa@cs.fiu.edu> Thu Apr 25 17:26:11 2019 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Fri Apr 26 10:49:02 2019 -0400
tree 709bcee11bd0316904df95a7eb68763d1978a513
parent b31206e87ef7b282fd0ac295f93a626048805c27

build: Remove unnecessary std::ref, causing compilation issues with Boost 1.70.0

Refs: #4923
Change-Id: Idba1abe89161b11b1ec80fdceac51e2b00ed507b

daemon/face/tcp-channel.cpp

diff --git a/daemon/face/tcp-channel.cpp b/daemon/face/tcp-channel.cpp
index dc0576f..a26c91e 100644
--- a/daemon/face/tcp-channel.cpp
+++ b/daemon/face/tcp-channel.cpp
@@ -83,7 +83,7 @@
     return;
   }
 
-  auto clientSocket = make_shared<ip::tcp::socket>(std::ref(getGlobalIoService()));
+  auto clientSocket = make_shared<ip::tcp::socket>(getGlobalIoService());
   auto timeoutEvent = getScheduler().schedule(timeout, [=] {
     handleConnectTimeout(remoteEndpoint, clientSocket, onConnectFailed);
   });

daemon/face/tcp-transport.cpp

diff --git a/daemon/face/tcp-transport.cpp b/daemon/face/tcp-transport.cpp
index 58c4add..0da07af 100644
--- a/daemon/face/tcp-transport.cpp
+++ b/daemon/face/tcp-transport.cpp
@@ -133,7 +133,13 @@
   BOOST_ASSERT(getState() == TransportState::DOWN);
 
   // recreate the socket
-  m_socket = protocol::socket(m_socket.get_io_service());
+  m_socket = protocol::socket(
+#if BOOST_VERSION >= 107000
+                              m_socket.get_executor()
+#else
+                              m_socket.get_io_service()
+#endif // BOOST_VERSION >= 107000
+                              );
   this->resetReceiveBuffer();
   this->resetSendQueue();
 

daemon/face/websocket-channel.cpp

diff --git a/daemon/face/websocket-channel.cpp b/daemon/face/websocket-channel.cpp
index f3f69ba..20b6686 100644
--- a/daemon/face/websocket-channel.cpp
+++ b/daemon/face/websocket-channel.cpp
@@ -123,7 +123,7 @@
   NFD_LOG_CHAN_TRACE("Incoming connection from " << m_server.get_con_from_hdl(hdl)->get_remote_endpoint());
 
   auto linkService = make_unique<GenericLinkService>();
-  auto transport = make_unique<WebSocketTransport>(hdl, std::ref(m_server), m_pingInterval);
+  auto transport = make_unique<WebSocketTransport>(hdl, m_server, m_pingInterval);
   auto face = make_shared<Face>(std::move(linkService), std::move(transport));
 
   BOOST_ASSERT(m_channelFaces.count(hdl) == 0);