Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-08-02 20:41:55 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-08-02 21:03:09 (GMT) |
| commit | d5ace22054203c7989691ae8b3fa4e4784d1b57e (patch) | |
| tree | 64d400cdb10644967df183d0f202fcbf8160a773 /3rdParty/Boost/src/boost/asio/ip/address_v6.hpp | |
| parent | 6f26d9aa86f0909af13b23b1a925b8d492e74154 (diff) | |
| download | swift-contrib-d5ace22054203c7989691ae8b3fa4e4784d1b57e.zip swift-contrib-d5ace22054203c7989691ae8b3fa4e4784d1b57e.tar.bz2 | |
Add two extra Boost dependencies, upgrade to 1.47.0ks/boost1.47
Diffstat (limited to '3rdParty/Boost/src/boost/asio/ip/address_v6.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/ip/address_v6.hpp | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/asio/ip/address_v6.hpp b/3rdParty/Boost/src/boost/asio/ip/address_v6.hpp index 9155bea..d2420c6 100644 --- a/3rdParty/Boost/src/boost/asio/ip/address_v6.hpp +++ b/3rdParty/Boost/src/boost/asio/ip/address_v6.hpp @@ -17,7 +17,7 @@ #include <boost/asio/detail/config.hpp> #include <string> -#include <boost/array.hpp> +#include <boost/asio/detail/array.hpp> #include <boost/asio/detail/socket_types.hpp> #include <boost/asio/detail/winsock_init.hpp> #include <boost/system/error_code.hpp> @@ -46,7 +46,15 @@ class address_v6 { public: /// The type used to represent an address as an array of bytes. - typedef boost::array<unsigned char, 16> bytes_type; + /** + * @note This type is defined in terms of the C++0x template @c std::array + * when it is available. Otherwise, it uses @c boost:array. + */ +#if defined(GENERATING_DOCUMENTATION) + typedef array<unsigned char, 16> bytes_type; +#else + typedef boost::asio::detail::array<unsigned char, 16> bytes_type; +#endif /// Default constructor. BOOST_ASIO_DECL address_v6(); @@ -58,9 +66,19 @@ public: /// Copy constructor. BOOST_ASIO_DECL address_v6(const address_v6& other); +#if defined(BOOST_ASIO_HAS_MOVE) + /// Move constructor. + BOOST_ASIO_DECL address_v6(address_v6&& other); +#endif // defined(BOOST_ASIO_HAS_MOVE) + /// Assign from another address. BOOST_ASIO_DECL address_v6& operator=(const address_v6& other); +#if defined(BOOST_ASIO_HAS_MOVE) + /// Move-assign from another address. + BOOST_ASIO_DECL address_v6& operator=(address_v6&& other); +#endif // defined(BOOST_ASIO_HAS_MOVE) + /// The scope ID of the address. /** * Returns the scope ID associated with the IPv6 address. |