commit 3c034206793d887819c9dce3c12245da120c43fc
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 06 00:06:48 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 09 15:14:20 2014 -0800
tree e998e72646c67889b4202ddc9891754d5c64f7c0
parent fb13ee61b30b0e3535a7e1b5433f2215f4f6ad7a

transport/unix: Fixing compilation in c++11 mode

Change-Id: I7535fa8b96bd0426ea0860af6db0b34a2c2da344

src/transport/unix-transport.cpp

diff --git a/src/transport/unix-transport.cpp b/src/transport/unix-transport.cpp
index 81a46cc..dd81109 100644
--- a/src/transport/unix-transport.cpp
+++ b/src/transport/unix-transport.cpp
@@ -13,7 +13,10 @@
 #include <ndn-cpp/c/util/ndn_memory.h>
 
 #include <boost/asio.hpp>
-#include <boost/bind.hpp>
+#if NDN_CPP_HAVE_CXX11
+// In the std library, the placeholders are in a different namespace than boost.
+using namespace ndn::func_lib::placeholders;
+#endif
 
 using namespace std;
 typedef boost::asio::local::stream_protocol protocol;
@@ -42,13 +45,13 @@
       {
         partialDataSize_ = 0;
         socket_.async_receive(boost::asio::buffer(inputBuffer_, MAX_LENGTH), 0,
-                              boost::bind(&Impl::handle_async_receive, this, _1, _2));
+                              func_lib::bind(&Impl::handle_async_receive, this, _1, _2));
 
         transport_.isConnected_ = true;
 
         for (std::list<Block>::iterator i = sendQueue_.begin(); i != sendQueue_.end(); ++i)
           socket_.async_send(boost::asio::buffer(i->wire(), i->size()),
-                             boost::bind(&Impl::handle_async_send, this, _1, *i));
+                             func_lib::bind(&Impl::handle_async_send, this, _1, *i));
 
         sendQueue_.clear();
       }
@@ -85,7 +88,7 @@
       sendQueue_.push_back(wire);
     else
       socket_.async_send(boost::asio::buffer(wire.wire(), wire.size()),
-                         boost::bind(&Impl::handle_async_send, this, _1, wire));
+                         func_lib::bind(&Impl::handle_async_send, this, _1, wire));
   }
 
   inline void
@@ -181,7 +184,7 @@
       }
 
     socket_.async_receive(boost::asio::buffer(inputBuffer_, MAX_LENGTH), 0,
-                          boost::bind(&Impl::handle_async_receive, this, _1, _2));
+                          func_lib::bind(&Impl::handle_async_receive, this, _1, _2));
   }
 
   void