1 files changed, 12 insertions, 9 deletions
diff --git a/3rdParty/Boost/src/boost/asio/placeholders.hpp b/3rdParty/Boost/src/boost/asio/placeholders.hpp
index d4bf743..06a093f 100644
--- a/3rdParty/Boost/src/boost/asio/placeholders.hpp
+++ b/3rdParty/Boost/src/boost/asio/placeholders.hpp
@@ -1,11 +1,11 @@
 //
 // placeholders.hpp
 // ~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2012 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2014 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
 #ifndef BOOST_ASIO_PLACEHOLDERS_HPP
@@ -13,14 +13,16 @@
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/bind/arg.hpp>
-#include <boost/detail/workaround.hpp>
+
+#if defined(BOOST_ASIO_HAS_BOOST_BIND)
+# include <boost/bind/arg.hpp>
+#endif // defined(BOOST_ASIO_HAS_BOOST_BIND)
 
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
 namespace placeholders {
@@ -44,13 +46,14 @@ unspecified iterator;
 
 /// An argument placeholder, for use with boost::bind(), that corresponds to
 /// the signal_number argument of a handler for asynchronous functions such as
 /// boost::asio::signal_set::async_wait.
 unspecified signal_number;
 
-#elif defined(__BORLANDC__) || defined(__GNUC__)
+#elif defined(BOOST_ASIO_HAS_BOOST_BIND)
+# if defined(__BORLANDC__) || defined(__GNUC__)
 
 inline boost::arg<1> error()
 {
   return boost::arg<1>();
 }
 
@@ -66,13 +69,13 @@ inline boost::arg<2> iterator()
 
 inline boost::arg<2> signal_number()
 {
   return boost::arg<2>();
 }
 
-#else
+# else
 
 namespace detail
 {
   template <int Number>
   struct placeholder
   {
@@ -81,24 +84,24 @@ namespace detail
       static boost::arg<Number> result;
       return result;
     }
   };
 }
 
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1400)
+#  if defined(BOOST_ASIO_MSVC) && (BOOST_ASIO_MSVC < 1400)
 
 static boost::arg<1>& error
   = boost::asio::placeholders::detail::placeholder<1>::get();
 static boost::arg<2>& bytes_transferred
   = boost::asio::placeholders::detail::placeholder<2>::get();
 static boost::arg<2>& iterator
   = boost::asio::placeholders::detail::placeholder<2>::get();
 static boost::arg<2>& signal_number
   = boost::asio::placeholders::detail::placeholder<2>::get();
 
-#else
+#  else
 
 namespace
 {
   boost::arg<1>& error
     = boost::asio::placeholders::detail::placeholder<1>::get();
   boost::arg<2>& bytes_transferred
@@ -106,14 +109,14 @@ namespace
   boost::arg<2>& iterator
     = boost::asio::placeholders::detail::placeholder<2>::get();
   boost::arg<2>& signal_number
     = boost::asio::placeholders::detail::placeholder<2>::get();
 } // namespace
 
-#endif
-
+#  endif
+# endif
 #endif
 
 } // namespace placeholders
 } // namespace asio
 } // namespace boost