1 files changed, 65 insertions, 9 deletions
diff --git a/3rdParty/Boost/src/boost/asio/basic_socket.hpp b/3rdParty/Boost/src/boost/asio/basic_socket.hpp
index c9e2045..a28f365 100644
--- a/3rdParty/Boost/src/boost/asio/basic_socket.hpp
+++ b/3rdParty/Boost/src/boost/asio/basic_socket.hpp
@@ -1,56 +1,58 @@
 //
 // basic_socket.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_BASIC_SOCKET_HPP
 #define BOOST_ASIO_BASIC_SOCKET_HPP
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
+#include <boost/asio/async_result.hpp>
 #include <boost/asio/basic_io_object.hpp>
 #include <boost/asio/detail/handler_type_requirements.hpp>
 #include <boost/asio/detail/throw_error.hpp>
+#include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/socket_base.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
 
 /// Provides socket functionality.
 /**
  * The basic_socket class template provides functionality that is common to both
  * stream-oriented and datagram-oriented sockets.
  *
  * @par Thread Safety
  * @e Distinct @e objects: Safe.@n
  * @e Shared @e objects: Unsafe.
  */
 template <typename Protocol, typename SocketService>
 class basic_socket
   : public basic_io_object<SocketService>,
     public socket_base
 {
 public:
   /// (Deprecated: Use native_handle_type.) The native representation of a
   /// socket.
   typedef typename SocketService::native_handle_type native_type;
 
   /// The native representation of a socket.
   typedef typename SocketService::native_handle_type native_handle_type;
 
   /// The protocol type.
   typedef Protocol protocol_type;
 
   /// The endpoint type.
   typedef typename Protocol::endpoint endpoint_type;
@@ -141,70 +143,115 @@ public:
   }
 
 #if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Move-construct a basic_socket from another.
   /**
    * This constructor moves a socket from one object to another.
    *
    * @param other The other basic_socket object from which the move will
    * occur.
    *
    * @note Following the move, the moved-from object is in the same state as if
    * constructed using the @c basic_socket(io_service&) constructor.
    */
   basic_socket(basic_socket&& other)
     : basic_io_object<SocketService>(
         BOOST_ASIO_MOVE_CAST(basic_socket)(other))
   {
   }
 
   /// Move-assign a basic_socket from another.
   /**
    * This assignment operator moves a socket from one object to another.
    *
    * @param other The other basic_socket object from which the move will
    * occur.
    *
    * @note Following the move, the moved-from object is in the same state as if
    * constructed using the @c basic_socket(io_service&) constructor.
    */
   basic_socket& operator=(basic_socket&& other)
   {
     basic_io_object<SocketService>::operator=(
         BOOST_ASIO_MOVE_CAST(basic_socket)(other));
     return *this;
   }
+
+  // All sockets have access to each other's implementations.
+  template <typename Protocol1, typename SocketService1>
+  friend class basic_socket;
+
+  /// Move-construct a basic_socket from a socket of another protocol type.
+  /**
+   * This constructor moves a socket from one object to another.
+   *
+   * @param other The other basic_socket object from which the move will
+   * occur.
+   *
+   * @note Following the move, the moved-from object is in the same state as if
+   * constructed using the @c basic_socket(io_service&) constructor.
+   */
+  template <typename Protocol1, typename SocketService1>
+  basic_socket(basic_socket<Protocol1, SocketService1>&& other,
+      typename enable_if<is_convertible<Protocol1, Protocol>::value>::type* = 0)
+    : basic_io_object<SocketService>(other.get_io_service())
+  {
+    this->get_service().template converting_move_construct<Protocol1>(
+        this->get_implementation(), other.get_implementation());
+  }
+
+  /// Move-assign a basic_socket from a socket of another protocol type.
+  /**
+   * This assignment operator moves a socket from one object to another.
+   *
+   * @param other The other basic_socket object from which the move will
+   * occur.
+   *
+   * @note Following the move, the moved-from object is in the same state as if
+   * constructed using the @c basic_socket(io_service&) constructor.
+   */
+  template <typename Protocol1, typename SocketService1>
+  typename enable_if<is_convertible<Protocol1, Protocol>::value,
+      basic_socket>::type& operator=(
+        basic_socket<Protocol1, SocketService1>&& other)
+  {
+    basic_socket tmp(BOOST_ASIO_MOVE_CAST2(basic_socket<
+            Protocol1, SocketService1>)(other));
+    basic_io_object<SocketService>::operator=(
+        BOOST_ASIO_MOVE_CAST(basic_socket)(tmp));
+    return *this;
+  }
 #endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
 
   /// Get a reference to the lowest layer.
   /**
    * This function returns a reference to the lowest layer in a stack of
    * layers. Since a basic_socket cannot contain any further layers, it simply
    * returns a reference to itself.
    *
    * @return A reference to the lowest layer in the stack of layers. Ownership
    * is not transferred to the caller.
    */
   lowest_layer_type& lowest_layer()
   {
     return *this;
   }
 
   /// Get a const reference to the lowest layer.
   /**
    * This function returns a const reference to the lowest layer in a stack of
    * layers. Since a basic_socket cannot contain any further layers, it simply
    * returns a reference to itself.
    *
    * @return A const reference to the lowest layer in the stack of layers.
    * Ownership is not transferred to the caller.
    */
   const lowest_layer_type& lowest_layer() const
   {
     return *this;
   }
 
   /// Open the socket using the specified protocol.
   /**
    * This function opens the socket so that it will use the specified protocol.
    *
    * @param protocol An object specifying protocol parameters to be used.
@@ -363,119 +410,119 @@ public:
 
   /// Cancel all asynchronous operations associated with the socket.
   /**
    * This function causes all outstanding asynchronous connect, send and receive
    * operations to finish immediately, and the handlers for cancelled operations
    * will be passed the boost::asio::error::operation_aborted error.
    *
    * @throws boost::system::system_error Thrown on failure.
    *
    * @note Calls to cancel() will always fail with
    * boost::asio::error::operation_not_supported when run on Windows XP, Windows
    * Server 2003, and earlier versions of Windows, unless
    * BOOST_ASIO_ENABLE_CANCELIO is defined. However, the CancelIo function has
    * two issues that should be considered before enabling its use:
    *
    * @li It will only cancel asynchronous operations that were initiated in the
    * current thread.
    *
    * @li It can appear to complete without error, but the request to cancel the
    * unfinished operations may be silently ignored by the operating system.
    * Whether it works or not seems to depend on the drivers that are installed.
    *
    * For portable cancellation, consider using one of the following
    * alternatives:
    *
    * @li Disable asio's I/O completion port backend by defining
    * BOOST_ASIO_DISABLE_IOCP.
    *
    * @li Use the close() function to simultaneously cancel the outstanding
    * operations and close the socket.
    *
    * When running on Windows Vista, Windows Server 2008, and later, the
    * CancelIoEx function is always used. This function does not have the
    * problems described above.
    */
-#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1400) \
+#if defined(BOOST_ASIO_MSVC) && (BOOST_ASIO_MSVC >= 1400) \
   && (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600) \
   && !defined(BOOST_ASIO_ENABLE_CANCELIO)
   __declspec(deprecated("By default, this function always fails with "
         "operation_not_supported when used on Windows XP, Windows Server 2003, "
         "or earlier. Consult documentation for details."))
 #endif
   void cancel()
   {
     boost::system::error_code ec;
     this->get_service().cancel(this->get_implementation(), ec);
     boost::asio::detail::throw_error(ec, "cancel");
   }
 
   /// Cancel all asynchronous operations associated with the socket.
   /**
    * This function causes all outstanding asynchronous connect, send and receive
    * operations to finish immediately, and the handlers for cancelled operations
    * will be passed the boost::asio::error::operation_aborted error.
    *
    * @param ec Set to indicate what error occurred, if any.
    *
    * @note Calls to cancel() will always fail with
    * boost::asio::error::operation_not_supported when run on Windows XP, Windows
    * Server 2003, and earlier versions of Windows, unless
    * BOOST_ASIO_ENABLE_CANCELIO is defined. However, the CancelIo function has
    * two issues that should be considered before enabling its use:
    *
    * @li It will only cancel asynchronous operations that were initiated in the
    * current thread.
    *
    * @li It can appear to complete without error, but the request to cancel the
    * unfinished operations may be silently ignored by the operating system.
    * Whether it works or not seems to depend on the drivers that are installed.
    *
    * For portable cancellation, consider using one of the following
    * alternatives:
    *
    * @li Disable asio's I/O completion port backend by defining
    * BOOST_ASIO_DISABLE_IOCP.
    *
    * @li Use the close() function to simultaneously cancel the outstanding
    * operations and close the socket.
    *
    * When running on Windows Vista, Windows Server 2008, and later, the
    * CancelIoEx function is always used. This function does not have the
    * problems described above.
    */
-#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1400) \
+#if defined(BOOST_ASIO_MSVC) && (BOOST_ASIO_MSVC >= 1400) \
   && (!defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600) \
   && !defined(BOOST_ASIO_ENABLE_CANCELIO)
   __declspec(deprecated("By default, this function always fails with "
         "operation_not_supported when used on Windows XP, Windows Server 2003, "
         "or earlier. Consult documentation for details."))
 #endif
   boost::system::error_code cancel(boost::system::error_code& ec)
   {
     return this->get_service().cancel(this->get_implementation(), ec);
   }
 
   /// Determine whether the socket is at the out-of-band data mark.
   /**
    * This function is used to check whether the socket input is currently
    * positioned at the out-of-band data mark.
    *
    * @return A bool indicating whether the socket is at the out-of-band data
    * mark.
    *
    * @throws boost::system::system_error Thrown on failure.
    */
   bool at_mark() const
   {
     boost::system::error_code ec;
     bool b = this->get_service().at_mark(this->get_implementation(), ec);
     boost::asio::detail::throw_error(ec, "at_mark");
     return b;
   }
 
   /// Determine whether the socket is at the out-of-band data mark.
   /**
    * This function is used to check whether the socket input is currently
    * positioned at the out-of-band data mark.
    *
    * @param ec Set to indicate what error occurred, if any.
@@ -666,91 +713,100 @@ public:
    * not returned to the closed state.
    *
    * @param peer_endpoint The remote endpoint to which the socket will be
    * connected. Copies will be made of the endpoint object as required.
    *
    * @param handler The handler to be called when the connection operation
    * completes. Copies will be made of the handler as required. The function
    * signature of the handler must be:
    * @code void handler(
    *   const boost::system::error_code& error // Result of operation
    * ); @endcode
    * Regardless of whether the asynchronous operation completes immediately or
    * not, the handler will not be invoked from within this function. Invocation
    * of the handler will be performed in a manner equivalent to using
    * boost::asio::io_service::post().
    *
    * @par Example
    * @code
    * void connect_handler(const boost::system::error_code& error)
    * {
    *   if (!error)
    *   {
    *     // Connect succeeded.
    *   }
    * }
    *
    * ...
    *
    * boost::asio::ip::tcp::socket socket(io_service);
    * boost::asio::ip::tcp::endpoint endpoint(
    *     boost::asio::ip::address::from_string("1.2.3.4"), 12345);
    * socket.async_connect(endpoint, connect_handler);
    * @endcode
    */
   template <typename ConnectHandler>
-  void async_connect(const endpoint_type& peer_endpoint,
+  BOOST_ASIO_INITFN_RESULT_TYPE(ConnectHandler,
+      void (boost::system::error_code))
+  async_connect(const endpoint_type& peer_endpoint,
       BOOST_ASIO_MOVE_ARG(ConnectHandler) handler)
   {
     // If you get an error on the following line it means that your handler does
     // not meet the documented type requirements for a ConnectHandler.
     BOOST_ASIO_CONNECT_HANDLER_CHECK(ConnectHandler, handler) type_check;
 
     if (!is_open())
     {
       boost::system::error_code ec;
       const protocol_type protocol = peer_endpoint.protocol();
       if (this->get_service().open(this->get_implementation(), protocol, ec))
       {
+        detail::async_result_init<
+          ConnectHandler, void (boost::system::error_code)> init(
+            BOOST_ASIO_MOVE_CAST(ConnectHandler)(handler));
+
         this->get_io_service().post(
             boost::asio::detail::bind_handler(
-              BOOST_ASIO_MOVE_CAST(ConnectHandler)(handler), ec));
-        return;
+              BOOST_ASIO_MOVE_CAST(BOOST_ASIO_HANDLER_TYPE(
+                ConnectHandler, void (boost::system::error_code)))(
+                  init.handler), ec));
+
+        return init.result.get();
       }
     }
 
-    this->get_service().async_connect(this->get_implementation(),
+    return this->get_service().async_connect(this->get_implementation(),
         peer_endpoint, BOOST_ASIO_MOVE_CAST(ConnectHandler)(handler));
   }
 
   /// Set an option on the socket.
   /**
    * This function is used to set an option on the socket.
    *
    * @param option The new option value to be set on the socket.
    *
    * @throws boost::system::system_error Thrown on failure.
    *
    * @sa SettableSocketOption @n
    * boost::asio::socket_base::broadcast @n
    * boost::asio::socket_base::do_not_route @n
    * boost::asio::socket_base::keep_alive @n
    * boost::asio::socket_base::linger @n
    * boost::asio::socket_base::receive_buffer_size @n
    * boost::asio::socket_base::receive_low_watermark @n
    * boost::asio::socket_base::reuse_address @n
    * boost::asio::socket_base::send_buffer_size @n
    * boost::asio::socket_base::send_low_watermark @n
    * boost::asio::ip::multicast::join_group @n
    * boost::asio::ip::multicast::leave_group @n
    * boost::asio::ip::multicast::enable_loopback @n
    * boost::asio::ip::multicast::outbound_interface @n
    * boost::asio::ip::multicast::hops @n
    * boost::asio::ip::tcp::no_delay
    *
    * @par Example
    * Setting the IPPROTO_TCP/TCP_NODELAY option:
    * @code
    * boost::asio::ip::tcp::socket socket(io_service);
    * ...
    * boost::asio::ip::tcp::no_delay option(true);
    * socket.set_option(option);
@@ -811,119 +867,119 @@ public:
         this->get_implementation(), option, ec);
   }
 
   /// Get an option from the socket.
   /**
    * This function is used to get the current value of an option on the socket.
    *
    * @param option The option value to be obtained from the socket.
    *
    * @throws boost::system::system_error Thrown on failure.
    *
    * @sa GettableSocketOption @n
    * boost::asio::socket_base::broadcast @n
    * boost::asio::socket_base::do_not_route @n
    * boost::asio::socket_base::keep_alive @n
    * boost::asio::socket_base::linger @n
    * boost::asio::socket_base::receive_buffer_size @n
    * boost::asio::socket_base::receive_low_watermark @n
    * boost::asio::socket_base::reuse_address @n
    * boost::asio::socket_base::send_buffer_size @n
    * boost::asio::socket_base::send_low_watermark @n
    * boost::asio::ip::multicast::join_group @n
    * boost::asio::ip::multicast::leave_group @n
    * boost::asio::ip::multicast::enable_loopback @n
    * boost::asio::ip::multicast::outbound_interface @n
    * boost::asio::ip::multicast::hops @n
    * boost::asio::ip::tcp::no_delay
    *
    * @par Example
    * Getting the value of the SOL_SOCKET/SO_KEEPALIVE option:
    * @code
    * boost::asio::ip::tcp::socket socket(io_service);
    * ...
    * boost::asio::ip::tcp::socket::keep_alive option;
    * socket.get_option(option);
-   * bool is_set = option.get();
+   * bool is_set = option.value();
    * @endcode
    */
   template <typename GettableSocketOption>
   void get_option(GettableSocketOption& option) const
   {
     boost::system::error_code ec;
     this->get_service().get_option(this->get_implementation(), option, ec);
     boost::asio::detail::throw_error(ec, "get_option");
   }
 
   /// Get an option from the socket.
   /**
    * This function is used to get the current value of an option on the socket.
    *
    * @param option The option value to be obtained from the socket.
    *
    * @param ec Set to indicate what error occurred, if any.
    *
    * @sa GettableSocketOption @n
    * boost::asio::socket_base::broadcast @n
    * boost::asio::socket_base::do_not_route @n
    * boost::asio::socket_base::keep_alive @n
    * boost::asio::socket_base::linger @n
    * boost::asio::socket_base::receive_buffer_size @n
    * boost::asio::socket_base::receive_low_watermark @n
    * boost::asio::socket_base::reuse_address @n
    * boost::asio::socket_base::send_buffer_size @n
    * boost::asio::socket_base::send_low_watermark @n
    * boost::asio::ip::multicast::join_group @n
    * boost::asio::ip::multicast::leave_group @n
    * boost::asio::ip::multicast::enable_loopback @n
    * boost::asio::ip::multicast::outbound_interface @n
    * boost::asio::ip::multicast::hops @n
    * boost::asio::ip::tcp::no_delay
    *
    * @par Example
    * Getting the value of the SOL_SOCKET/SO_KEEPALIVE option:
    * @code
    * boost::asio::ip::tcp::socket socket(io_service);
    * ...
    * boost::asio::ip::tcp::socket::keep_alive option;
    * boost::system::error_code ec;
    * socket.get_option(option, ec);
    * if (ec)
    * {
    *   // An error occurred.
    * }
-   * bool is_set = option.get();
+   * bool is_set = option.value();
    * @endcode
    */
   template <typename GettableSocketOption>
   boost::system::error_code get_option(GettableSocketOption& option,
       boost::system::error_code& ec) const
   {
     return this->get_service().get_option(
         this->get_implementation(), option, ec);
   }
 
   /// Perform an IO control command on the socket.
   /**
    * This function is used to execute an IO control command on the socket.
    *
    * @param command The IO control command to be performed on the socket.
    *
    * @throws boost::system::system_error Thrown on failure.
    *
    * @sa IoControlCommand @n
    * boost::asio::socket_base::bytes_readable @n
    * boost::asio::socket_base::non_blocking_io
    *
    * @par Example
    * Getting the number of bytes ready to read:
    * @code
    * boost::asio::ip::tcp::socket socket(io_service);
    * ...
    * boost::asio::ip::tcp::socket::bytes_readable command;
    * socket.io_control(command);
    * std::size_t bytes_readable = command.get();
    * @endcode
    */
   template <typename IoControlCommand>
   void io_control(IoControlCommand& command)
   {