updated boost on windows
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
// ip/address.hpp
|
||||
// ~~~~~~~~~~~~~~
|
||||
//
|
||||
// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
// Copyright (c) 2003-2019 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)
|
||||
@@ -17,9 +17,13 @@
|
||||
|
||||
#include <boost/asio/detail/config.hpp>
|
||||
#include <string>
|
||||
#include <boost/asio/detail/throw_exception.hpp>
|
||||
#include <boost/asio/detail/string_view.hpp>
|
||||
#include <boost/asio/detail/type_traits.hpp>
|
||||
#include <boost/system/error_code.hpp>
|
||||
#include <boost/asio/ip/address_v4.hpp>
|
||||
#include <boost/asio/ip/address_v6.hpp>
|
||||
#include <boost/asio/ip/bad_address_cast.hpp>
|
||||
|
||||
#if !defined(BOOST_ASIO_NO_IOSTREAM)
|
||||
# include <iosfwd>
|
||||
@@ -44,46 +48,48 @@ class address
|
||||
{
|
||||
public:
|
||||
/// Default constructor.
|
||||
BOOST_ASIO_DECL address();
|
||||
BOOST_ASIO_DECL address() BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Construct an address from an IPv4 address.
|
||||
BOOST_ASIO_DECL address(const boost::asio::ip::address_v4& ipv4_address);
|
||||
BOOST_ASIO_DECL address(
|
||||
const boost::asio::ip::address_v4& ipv4_address) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Construct an address from an IPv6 address.
|
||||
BOOST_ASIO_DECL address(const boost::asio::ip::address_v6& ipv6_address);
|
||||
BOOST_ASIO_DECL address(
|
||||
const boost::asio::ip::address_v6& ipv6_address) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Copy constructor.
|
||||
BOOST_ASIO_DECL address(const address& other);
|
||||
BOOST_ASIO_DECL address(const address& other) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
#if defined(BOOST_ASIO_HAS_MOVE)
|
||||
/// Move constructor.
|
||||
BOOST_ASIO_DECL address(address&& other);
|
||||
BOOST_ASIO_DECL address(address&& other) BOOST_ASIO_NOEXCEPT;
|
||||
#endif // defined(BOOST_ASIO_HAS_MOVE)
|
||||
|
||||
/// Assign from another address.
|
||||
BOOST_ASIO_DECL address& operator=(const address& other);
|
||||
BOOST_ASIO_DECL address& operator=(const address& other) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
#if defined(BOOST_ASIO_HAS_MOVE)
|
||||
/// Move-assign from another address.
|
||||
BOOST_ASIO_DECL address& operator=(address&& other);
|
||||
BOOST_ASIO_DECL address& operator=(address&& other) BOOST_ASIO_NOEXCEPT;
|
||||
#endif // defined(BOOST_ASIO_HAS_MOVE)
|
||||
|
||||
/// Assign from an IPv4 address.
|
||||
BOOST_ASIO_DECL address& operator=(
|
||||
const boost::asio::ip::address_v4& ipv4_address);
|
||||
const boost::asio::ip::address_v4& ipv4_address) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Assign from an IPv6 address.
|
||||
BOOST_ASIO_DECL address& operator=(
|
||||
const boost::asio::ip::address_v6& ipv6_address);
|
||||
const boost::asio::ip::address_v6& ipv6_address) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Get whether the address is an IP version 4 address.
|
||||
bool is_v4() const
|
||||
bool is_v4() const BOOST_ASIO_NOEXCEPT
|
||||
{
|
||||
return type_ == ipv4;
|
||||
}
|
||||
|
||||
/// Get whether the address is an IP version 6 address.
|
||||
bool is_v6() const
|
||||
bool is_v6() const BOOST_ASIO_NOEXCEPT
|
||||
{
|
||||
return type_ == ipv6;
|
||||
}
|
||||
@@ -94,65 +100,76 @@ public:
|
||||
/// Get the address as an IP version 6 address.
|
||||
BOOST_ASIO_DECL boost::asio::ip::address_v6 to_v6() const;
|
||||
|
||||
/// Get the address as a string in dotted decimal format.
|
||||
/// Get the address as a string.
|
||||
BOOST_ASIO_DECL std::string to_string() const;
|
||||
|
||||
/// Get the address as a string in dotted decimal format.
|
||||
#if !defined(BOOST_ASIO_NO_DEPRECATED)
|
||||
/// (Deprecated: Use other overload.) Get the address as a string.
|
||||
BOOST_ASIO_DECL std::string to_string(boost::system::error_code& ec) const;
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
BOOST_ASIO_DECL static address from_string(const char* str);
|
||||
/// (Deprecated: Use make_address().) Create an address from an IPv4 address
|
||||
/// string in dotted decimal form, or from an IPv6 address in hexadecimal
|
||||
/// notation.
|
||||
static address from_string(const char* str);
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
BOOST_ASIO_DECL static address from_string(
|
||||
const char* str, boost::system::error_code& ec);
|
||||
/// (Deprecated: Use make_address().) Create an address from an IPv4 address
|
||||
/// string in dotted decimal form, or from an IPv6 address in hexadecimal
|
||||
/// notation.
|
||||
static address from_string(const char* str, boost::system::error_code& ec);
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
BOOST_ASIO_DECL static address from_string(const std::string& str);
|
||||
/// (Deprecated: Use make_address().) Create an address from an IPv4 address
|
||||
/// string in dotted decimal form, or from an IPv6 address in hexadecimal
|
||||
/// notation.
|
||||
static address from_string(const std::string& str);
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
BOOST_ASIO_DECL static address from_string(
|
||||
/// (Deprecated: Use make_address().) Create an address from an IPv4 address
|
||||
/// string in dotted decimal form, or from an IPv6 address in hexadecimal
|
||||
/// notation.
|
||||
static address from_string(
|
||||
const std::string& str, boost::system::error_code& ec);
|
||||
#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
|
||||
|
||||
/// Determine whether the address is a loopback address.
|
||||
BOOST_ASIO_DECL bool is_loopback() const;
|
||||
BOOST_ASIO_DECL bool is_loopback() const BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Determine whether the address is unspecified.
|
||||
BOOST_ASIO_DECL bool is_unspecified() const;
|
||||
BOOST_ASIO_DECL bool is_unspecified() const BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Determine whether the address is a multicast address.
|
||||
BOOST_ASIO_DECL bool is_multicast() const;
|
||||
BOOST_ASIO_DECL bool is_multicast() const BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Compare two addresses for equality.
|
||||
BOOST_ASIO_DECL friend bool operator==(const address& a1, const address& a2);
|
||||
BOOST_ASIO_DECL friend bool operator==(const address& a1,
|
||||
const address& a2) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Compare two addresses for inequality.
|
||||
friend bool operator!=(const address& a1, const address& a2)
|
||||
friend bool operator!=(const address& a1,
|
||||
const address& a2) BOOST_ASIO_NOEXCEPT
|
||||
{
|
||||
return !(a1 == a2);
|
||||
}
|
||||
|
||||
/// Compare addresses for ordering.
|
||||
BOOST_ASIO_DECL friend bool operator<(const address& a1, const address& a2);
|
||||
BOOST_ASIO_DECL friend bool operator<(const address& a1,
|
||||
const address& a2) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Compare addresses for ordering.
|
||||
friend bool operator>(const address& a1, const address& a2)
|
||||
friend bool operator>(const address& a1,
|
||||
const address& a2) BOOST_ASIO_NOEXCEPT
|
||||
{
|
||||
return a2 < a1;
|
||||
}
|
||||
|
||||
/// Compare addresses for ordering.
|
||||
friend bool operator<=(const address& a1, const address& a2)
|
||||
friend bool operator<=(const address& a1,
|
||||
const address& a2) BOOST_ASIO_NOEXCEPT
|
||||
{
|
||||
return !(a2 < a1);
|
||||
}
|
||||
|
||||
/// Compare addresses for ordering.
|
||||
friend bool operator>=(const address& a1, const address& a2)
|
||||
friend bool operator>=(const address& a1,
|
||||
const address& a2) BOOST_ASIO_NOEXCEPT
|
||||
{
|
||||
return !(a1 < a2);
|
||||
}
|
||||
@@ -168,6 +185,57 @@ private:
|
||||
boost::asio::ip::address_v6 ipv6_address_;
|
||||
};
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
/**
|
||||
* @relates address
|
||||
*/
|
||||
BOOST_ASIO_DECL address make_address(const char* str);
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
/**
|
||||
* @relates address
|
||||
*/
|
||||
BOOST_ASIO_DECL address make_address(const char* str,
|
||||
boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
/**
|
||||
* @relates address
|
||||
*/
|
||||
BOOST_ASIO_DECL address make_address(const std::string& str);
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
/**
|
||||
* @relates address
|
||||
*/
|
||||
BOOST_ASIO_DECL address make_address(const std::string& str,
|
||||
boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
#if defined(BOOST_ASIO_HAS_STRING_VIEW) \
|
||||
|| defined(GENERATING_DOCUMENTATION)
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
/**
|
||||
* @relates address
|
||||
*/
|
||||
BOOST_ASIO_DECL address make_address(string_view str);
|
||||
|
||||
/// Create an address from an IPv4 address string in dotted decimal form,
|
||||
/// or from an IPv6 address in hexadecimal notation.
|
||||
/**
|
||||
* @relates address
|
||||
*/
|
||||
BOOST_ASIO_DECL address make_address(string_view str,
|
||||
boost::system::error_code& ec) BOOST_ASIO_NOEXCEPT;
|
||||
|
||||
#endif // defined(BOOST_ASIO_HAS_STRING_VIEW)
|
||||
// || defined(GENERATING_DOCUMENTATION)
|
||||
|
||||
#if !defined(BOOST_ASIO_NO_IOSTREAM)
|
||||
|
||||
/// Output an address as a string.
|
||||
|
||||
Reference in New Issue
Block a user