commit 3b101d06827c46a070081733cd40dbb3636ccf64
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Jul 21 22:44:09 2018 -0400
committer Alex Afanasyev <aa@cs.fiu.edu> Tue Jul 24 15:17:34 2018 -0700
tree 21fe3caa45ffe1204a15383f67a678f996c91351
parent cf0aff8a03bb49bc52f46f462826bf362234473a

Use std::move in more places

Plus various code simplifications

Change-Id: I19805e4a635e4c74afaff68f9d8968475217ec6e

src/face.cpp

diff --git a/src/face.cpp b/src/face.cpp
index cf1e69d..abdd93b 100644
--- a/src/face.cpp
+++ b/src/face.cpp
@@ -322,18 +322,16 @@
     }
 
     if (timeout > time::milliseconds::zero()) {
-      boost::asio::io_service& ioService = m_ioService;
-      unique_ptr<boost::asio::io_service::work>& work = m_impl->m_ioServiceWork;
       m_impl->m_processEventsTimeoutEvent = m_impl->m_scheduler.scheduleEvent(timeout,
-        [&ioService, &work] {
-          ioService.stop();
+        [&io = m_ioService, &work = m_impl->m_ioServiceWork] {
+          io.stop();
           work.reset();
         });
     }
 
     if (keepThread) {
       // work will ensure that m_ioService is running until work object exists
-      m_impl->m_ioServiceWork.reset(new boost::asio::io_service::work(m_ioService));
+      m_impl->m_ioServiceWork = make_unique<boost::asio::io_service::work>(m_ioService);
     }
 
     m_ioService.run();