Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-23 13:16:26 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-12-23 14:43:26 (GMT) |
| commit | 491ddd570a752cf9bda85933bed0c6942e39b1f9 (patch) | |
| tree | 10c25c1be8cc08d0497df1dccd56a10fbb30beee /3rdParty/Boost/src/boost/asio/ip/icmp.hpp | |
| parent | da7d7a0ca71b80281aa9ff2526290b61ccb0cc60 (diff) | |
| download | swift-contrib-491ddd570a752cf9bda85933bed0c6942e39b1f9.zip swift-contrib-491ddd570a752cf9bda85933bed0c6942e39b1f9.tar.bz2 | |
Update Boost to 1.52.0.
Change-Id: I1e56bea2600bf2ed9c5b3aba8c4f9d2a0f350e77
Diffstat (limited to '3rdParty/Boost/src/boost/asio/ip/icmp.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/asio/ip/icmp.hpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/3rdParty/Boost/src/boost/asio/ip/icmp.hpp b/3rdParty/Boost/src/boost/asio/ip/icmp.hpp index 14bb944..62748b6 100644 --- a/3rdParty/Boost/src/boost/asio/ip/icmp.hpp +++ b/3rdParty/Boost/src/boost/asio/ip/icmp.hpp @@ -2,7 +2,7 @@ // ip/icmp.hpp // ~~~~~~~~~~~ // -// Copyright (c) 2003-2011 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2012 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) @@ -46,12 +46,6 @@ public: /// The type of a ICMP endpoint. typedef basic_endpoint<icmp> endpoint; - /// (Deprecated: use resolver::query.) The type of a resolver query. - typedef basic_resolver_query<icmp> resolver_query; - - /// (Deprecated: use resolver::iterator.) The type of a resolver iterator. - typedef basic_resolver_iterator<icmp> resolver_iterator; - /// Construct to represent the IPv4 ICMP protocol. static icmp v4() { @@ -102,9 +96,9 @@ public: private: // Construct with a specific family. - explicit icmp(int protocol, int family) - : protocol_(protocol), - family_(family) + explicit icmp(int protocol_id, int protocol_family) + : protocol_(protocol_id), + family_(protocol_family) { } |