1 files changed, 48 insertions, 185 deletions
diff --git a/3rdParty/Boost/src/boost/asio/ip/basic_endpoint.hpp b/3rdParty/Boost/src/boost/asio/ip/basic_endpoint.hpp
index f191a4c..10459c4 100644
--- a/3rdParty/Boost/src/boost/asio/ip/basic_endpoint.hpp
+++ b/3rdParty/Boost/src/boost/asio/ip/basic_endpoint.hpp
@@ -1,6 +1,6 @@
 //
-// basic_endpoint.hpp
-// ~~~~~~~~~~~~~~~~~~
+// ip/basic_endpoint.hpp
+// ~~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2003-2010 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
@@ -15,25 +15,15 @@
 # pragma once
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
-#include <boost/asio/detail/push_options.hpp>
+#include <boost/asio/detail/config.hpp>
+#include <boost/asio/ip/address.hpp>
+#include <boost/asio/ip/detail/endpoint.hpp>
 
-#include <boost/asio/detail/push_options.hpp>
-#include <boost/config.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/detail/workaround.hpp>
-#include <cstring>
 #if !defined(BOOST_NO_IOSTREAM)
-# if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-#  include <ostream>
-# endif // BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-# include <sstream>
+# include <iosfwd>
 #endif // !defined(BOOST_NO_IOSTREAM)
-#include <boost/asio/detail/pop_options.hpp>
 
-#include <boost/asio/error.hpp>
-#include <boost/asio/ip/address.hpp>
-#include <boost/asio/detail/socket_ops.hpp>
-#include <boost/asio/detail/socket_types.hpp>
+#include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
@@ -68,11 +58,8 @@ public:
 
   /// Default constructor.
   basic_endpoint()
-    : data_()
+    : impl_()
   {
-    data_.v4.sin_family = AF_INET;
-    data_.v4.sin_port = 0;
-    data_.v4.sin_addr.s_addr = INADDR_ANY;
   }
 
   /// Construct an endpoint using a port number, specified in the host's byte
@@ -92,74 +79,35 @@ public:
    * @endcode
    */
   basic_endpoint(const InternetProtocol& protocol, unsigned short port_num)
-    : data_()
+    : impl_(protocol.family(), port_num)
   {
-    using namespace std; // For memcpy.
-    if (protocol.family() == PF_INET)
-    {
-      data_.v4.sin_family = AF_INET;
-      data_.v4.sin_port =
-        boost::asio::detail::socket_ops::host_to_network_short(port_num);
-      data_.v4.sin_addr.s_addr = INADDR_ANY;
-    }
-    else
-    {
-      data_.v6.sin6_family = AF_INET6;
-      data_.v6.sin6_port =
-        boost::asio::detail::socket_ops::host_to_network_short(port_num);
-      data_.v6.sin6_flowinfo = 0;
-      boost::asio::detail::in6_addr_type tmp_addr = IN6ADDR_ANY_INIT;
-      data_.v6.sin6_addr = tmp_addr;
-      data_.v6.sin6_scope_id = 0;
-    }
   }
 
   /// Construct an endpoint using a port number and an IP address. This
   /// constructor may be used for accepting connections on a specific interface
   /// or for making a connection to a remote endpoint.
   basic_endpoint(const boost::asio::ip::address& addr, unsigned short port_num)
-    : data_()
+    : impl_(addr, port_num)
   {
-    using namespace std; // For memcpy.
-    if (addr.is_v4())
-    {
-      data_.v4.sin_family = AF_INET;
-      data_.v4.sin_port =
-        boost::asio::detail::socket_ops::host_to_network_short(port_num);
-      data_.v4.sin_addr.s_addr =
-        boost::asio::detail::socket_ops::host_to_network_long(
-            addr.to_v4().to_ulong());
-    }
-    else
-    {
-      data_.v6.sin6_family = AF_INET6;
-      data_.v6.sin6_port =
-        boost::asio::detail::socket_ops::host_to_network_short(port_num);
-      data_.v6.sin6_flowinfo = 0;
-      boost::asio::ip::address_v6 v6_addr = addr.to_v6();
-      boost::asio::ip::address_v6::bytes_type bytes = v6_addr.to_bytes();
-      memcpy(data_.v6.sin6_addr.s6_addr, bytes.elems, 16);
-      data_.v6.sin6_scope_id = v6_addr.scope_id();
-    }
   }
 
   /// Copy constructor.
   basic_endpoint(const basic_endpoint& other)
-    : data_(other.data_)
+    : impl_(other.impl_)
   {
   }
 
   /// Assign from another endpoint.
   basic_endpoint& operator=(const basic_endpoint& other)
   {
-    data_ = other.data_;
+    impl_ = other.impl_;
     return *this;
   }
 
   /// The protocol associated with the endpoint.
   protocol_type protocol() const
   {
-    if (is_v4())
+    if (impl_.is_v4())
       return InternetProtocol::v4();
     return InternetProtocol::v6();
   }
@@ -167,137 +115,104 @@ public:
   /// Get the underlying endpoint in the native type.
   data_type* data()
   {
-    return &data_.base;
+    return impl_.data();
   }
 
   /// Get the underlying endpoint in the native type.
   const data_type* data() const
   {
-    return &data_.base;
+    return impl_.data();
   }
 
   /// Get the underlying size of the endpoint in the native type.
   std::size_t size() const
   {
-    if (is_v4())
-      return sizeof(boost::asio::detail::sockaddr_in4_type);
-    else
-      return sizeof(boost::asio::detail::sockaddr_in6_type);
+    return impl_.size();
   }
 
   /// Set the underlying size of the endpoint in the native type.
   void resize(std::size_t size)
   {
-    if (size > sizeof(boost::asio::detail::sockaddr_storage_type))
-    {
-      boost::system::system_error e(boost::asio::error::invalid_argument);
-      boost::throw_exception(e);
-    }
+    impl_.resize(size);
   }
 
   /// Get the capacity of the endpoint in the native type.
   std::size_t capacity() const
   {
-    return sizeof(boost::asio::detail::sockaddr_storage_type);
+    return impl_.capacity();
   }
 
   /// Get the port associated with the endpoint. The port number is always in
   /// the host's byte order.
   unsigned short port() const
   {
-    if (is_v4())
-    {
-      return boost::asio::detail::socket_ops::network_to_host_short(
-          data_.v4.sin_port);
-    }
-    else
-    {
-      return boost::asio::detail::socket_ops::network_to_host_short(
-          data_.v6.sin6_port);
-    }
+    return impl_.port();
   }
 
   /// Set the port associated with the endpoint. The port number is always in
   /// the host's byte order.
   void port(unsigned short port_num)
   {
-    if (is_v4())
-    {
-      data_.v4.sin_port
-        = boost::asio::detail::socket_ops::host_to_network_short(port_num);
-    }
-    else
-    {
-      data_.v6.sin6_port
-        = boost::asio::detail::socket_ops::host_to_network_short(port_num);
-    }
+    impl_.port(port_num);
   }
 
   /// Get the IP address associated with the endpoint.
   boost::asio::ip::address address() const
   {
-    using namespace std; // For memcpy.
-    if (is_v4())
-    {
-      return boost::asio::ip::address_v4(
-          boost::asio::detail::socket_ops::network_to_host_long(
-            data_.v4.sin_addr.s_addr));
-    }
-    else
-    {
-      boost::asio::ip::address_v6::bytes_type bytes;
-      memcpy(bytes.elems, data_.v6.sin6_addr.s6_addr, 16);
-      return boost::asio::ip::address_v6(bytes, data_.v6.sin6_scope_id);
-    }
+    return impl_.address();
   }
 
   /// Set the IP address associated with the endpoint.
   void address(const boost::asio::ip::address& addr)
   {
-    basic_endpoint<InternetProtocol> tmp_endpoint(addr, port());
-    data_ = tmp_endpoint.data_;
+    impl_.address(addr);
   }
 
   /// Compare two endpoints for equality.
   friend bool operator==(const basic_endpoint<InternetProtocol>& e1,
       const basic_endpoint<InternetProtocol>& e2)
   {
-    return e1.address() == e2.address() && e1.port() == e2.port();
+    return e1.impl_ == e2.impl_;
   }
 
   /// Compare two endpoints for inequality.
   friend bool operator!=(const basic_endpoint<InternetProtocol>& e1,
       const basic_endpoint<InternetProtocol>& e2)
   {
-    return e1.address() != e2.address() || e1.port() != e2.port();
+    return !(e1 == e2);
   }
 
   /// Compare endpoints for ordering.
   friend bool operator<(const basic_endpoint<InternetProtocol>& e1,
       const basic_endpoint<InternetProtocol>& e2)
   {
-    if (e1.address() < e2.address())
-      return true;
-    if (e1.address() != e2.address())
-      return false;
-    return e1.port() < e2.port();
+    return e1.impl_ < e2.impl_;
   }
 
-private:
-  // Helper function to determine whether the endpoint is IPv4.
-  bool is_v4() const
+  /// Compare endpoints for ordering.
+  friend bool operator>(const basic_endpoint<InternetProtocol>& e1,
+      const basic_endpoint<InternetProtocol>& e2)
+  {
+    return e2.impl_ < e1.impl_;
+  }
+
+  /// Compare endpoints for ordering.
+  friend bool operator<=(const basic_endpoint<InternetProtocol>& e1,
+      const basic_endpoint<InternetProtocol>& e2)
   {
-    return data_.base.sa_family == AF_INET;
+    return !(e2 < e1);
   }
 
-  // The underlying IP socket address.
-  union data_union
+  /// Compare endpoints for ordering.
+  friend bool operator>=(const basic_endpoint<InternetProtocol>& e1,
+      const basic_endpoint<InternetProtocol>& e2)
   {
-    boost::asio::detail::socket_addr_type base;
-    boost::asio::detail::sockaddr_storage_type storage;
-    boost::asio::detail::sockaddr_in4_type v4;
-    boost::asio::detail::sockaddr_in6_type v6;
-  } data_;
+    return !(e1 < e2);
+  }
+
+private:
+  // The underlying IP endpoint.
+  boost::asio::ip::detail::endpoint impl_;
 };
 
 #if !defined(BOOST_NO_IOSTREAM)
@@ -314,64 +229,10 @@ private:
  *
  * @relates boost::asio::ip::basic_endpoint
  */
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
-template <typename InternetProtocol>
-std::ostream& operator<<(std::ostream& os,
-    const basic_endpoint<InternetProtocol>& endpoint)
-{
-  const address& addr = endpoint.address();
-  boost::system::error_code ec;
-  std::string a = addr.to_string(ec);
-  if (ec)
-  {
-    if (os.exceptions() & std::ios::failbit)
-      boost::asio::detail::throw_error(ec);
-    else
-      os.setstate(std::ios_base::failbit);
-  }
-  else
-  {
-    std::ostringstream tmp_os;
-    tmp_os.imbue(std::locale::classic());
-    if (addr.is_v4())
-      tmp_os << a;
-    else
-      tmp_os << '[' << a << ']';
-    tmp_os << ':' << endpoint.port();
-    os << tmp_os.str();
-  }
-  return os;
-}
-#else // BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 template <typename Elem, typename Traits, typename InternetProtocol>
 std::basic_ostream<Elem, Traits>& operator<<(
     std::basic_ostream<Elem, Traits>& os,
-    const basic_endpoint<InternetProtocol>& endpoint)
-{
-  const address& addr = endpoint.address();
-  boost::system::error_code ec;
-  std::string a = addr.to_string(ec);
-  if (ec)
-  {
-    if (os.exceptions() & std::ios::failbit)
-      boost::asio::detail::throw_error(ec);
-    else
-      os.setstate(std::ios_base::failbit);
-  }
-  else
-  {
-    std::ostringstream tmp_os;
-    tmp_os.imbue(std::locale::classic());
-    if (addr.is_v4())
-      tmp_os << a;
-    else
-      tmp_os << '[' << a << ']';
-    tmp_os << ':' << endpoint.port();
-    os << tmp_os.str();
-  }
-  return os;
-}
-#endif // BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+    const basic_endpoint<InternetProtocol>& endpoint);
 
 #endif // !defined(BOOST_NO_IOSTREAM)
 
@@ -381,4 +242,6 @@ std::basic_ostream<Elem, Traits>& operator<<(
 
 #include <boost/asio/detail/pop_options.hpp>
 
+#include <boost/asio/ip/impl/basic_endpoint.hpp>
+
 #endif // BOOST_ASIO_IP_BASIC_ENDPOINT_HPP