From b8cf34c691623e4ec329053cbbf68522a855882d Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 5 Dec 2019 15:12:59 +0900 Subject: Imported Upstream version 1.67.0 --- boost/asio/ip/impl/address.hpp | 2 +- boost/asio/ip/impl/address.ipp | 6 +++--- boost/asio/ip/impl/address_v4.hpp | 2 +- boost/asio/ip/impl/address_v4.ipp | 6 +++--- boost/asio/ip/impl/address_v6.hpp | 2 +- boost/asio/ip/impl/address_v6.ipp | 6 +++--- boost/asio/ip/impl/basic_endpoint.hpp | 2 +- boost/asio/ip/impl/host_name.ipp | 2 +- boost/asio/ip/impl/network_v4.hpp | 2 +- boost/asio/ip/impl/network_v4.ipp | 7 ++++--- boost/asio/ip/impl/network_v6.hpp | 2 +- boost/asio/ip/impl/network_v6.ipp | 7 ++++--- 12 files changed, 24 insertions(+), 22 deletions(-) (limited to 'boost/asio/ip/impl') diff --git a/boost/asio/ip/impl/address.hpp b/boost/asio/ip/impl/address.hpp index 552cb5fd6d..cf5afb4fcf 100644 --- a/boost/asio/ip/impl/address.hpp +++ b/boost/asio/ip/impl/address.hpp @@ -2,7 +2,7 @@ // ip/impl/address.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) diff --git a/boost/asio/ip/impl/address.ipp b/boost/asio/ip/impl/address.ipp index 6c615592e5..9afa566a35 100644 --- a/boost/asio/ip/impl/address.ipp +++ b/boost/asio/ip/impl/address.ipp @@ -2,7 +2,7 @@ // ip/impl/address.ipp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) @@ -135,7 +135,7 @@ address make_address(const std::string& str, return make_address(str.c_str(), ec); } -#if defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#if defined(BOOST_ASIO_HAS_STRING_VIEW) address make_address(string_view str) { @@ -148,7 +148,7 @@ address make_address(string_view str, return make_address(static_cast(str), ec); } -#endif // defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#endif // defined(BOOST_ASIO_HAS_STRING_VIEW) boost::asio::ip::address_v4 address::to_v4() const { diff --git a/boost/asio/ip/impl/address_v4.hpp b/boost/asio/ip/impl/address_v4.hpp index a273f5e73e..838dc613e2 100644 --- a/boost/asio/ip/impl/address_v4.hpp +++ b/boost/asio/ip/impl/address_v4.hpp @@ -2,7 +2,7 @@ // ip/impl/address_v4.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) diff --git a/boost/asio/ip/impl/address_v4.ipp b/boost/asio/ip/impl/address_v4.ipp index d6db61f80d..7693deaf40 100644 --- a/boost/asio/ip/impl/address_v4.ipp +++ b/boost/asio/ip/impl/address_v4.ipp @@ -2,7 +2,7 @@ // ip/impl/address_v4.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) @@ -188,7 +188,7 @@ address_v4 make_address_v4( return make_address_v4(str.c_str(), ec); } -#if defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#if defined(BOOST_ASIO_HAS_STRING_VIEW) address_v4 make_address_v4(string_view str) { @@ -201,7 +201,7 @@ address_v4 make_address_v4(string_view str, return make_address_v4(static_cast(str), ec); } -#endif // defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#endif // defined(BOOST_ASIO_HAS_STRING_VIEW) } // namespace ip } // namespace asio diff --git a/boost/asio/ip/impl/address_v6.hpp b/boost/asio/ip/impl/address_v6.hpp index e1d9932d30..f989b6a702 100644 --- a/boost/asio/ip/impl/address_v6.hpp +++ b/boost/asio/ip/impl/address_v6.hpp @@ -2,7 +2,7 @@ // ip/impl/address_v6.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) diff --git a/boost/asio/ip/impl/address_v6.ipp b/boost/asio/ip/impl/address_v6.ipp index 1741bbcf79..4eea4bc5a0 100644 --- a/boost/asio/ip/impl/address_v6.ipp +++ b/boost/asio/ip/impl/address_v6.ipp @@ -2,7 +2,7 @@ // ip/impl/address_v6.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) @@ -304,7 +304,7 @@ address_v6 make_address_v6( return make_address_v6(str.c_str(), ec); } -#if defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#if defined(BOOST_ASIO_HAS_STRING_VIEW) address_v6 make_address_v6(string_view str) { @@ -317,7 +317,7 @@ address_v6 make_address_v6(string_view str, return make_address_v6(static_cast(str), ec); } -#endif // defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#endif // defined(BOOST_ASIO_HAS_STRING_VIEW) address_v4 make_address_v4( v4_mapped_t, const address_v6& v6_addr) diff --git a/boost/asio/ip/impl/basic_endpoint.hpp b/boost/asio/ip/impl/basic_endpoint.hpp index 590e9748f3..23655bf940 100644 --- a/boost/asio/ip/impl/basic_endpoint.hpp +++ b/boost/asio/ip/impl/basic_endpoint.hpp @@ -2,7 +2,7 @@ // ip/impl/basic_endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) diff --git a/boost/asio/ip/impl/host_name.ipp b/boost/asio/ip/impl/host_name.ipp index ab85f41793..17b8395a76 100644 --- a/boost/asio/ip/impl/host_name.ipp +++ b/boost/asio/ip/impl/host_name.ipp @@ -2,7 +2,7 @@ // ip/impl/host_name.ipp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) diff --git a/boost/asio/ip/impl/network_v4.hpp b/boost/asio/ip/impl/network_v4.hpp index 6d9ebaa184..3ca4e746bd 100644 --- a/boost/asio/ip/impl/network_v4.hpp +++ b/boost/asio/ip/impl/network_v4.hpp @@ -2,7 +2,7 @@ // ip/impl/network_v4.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying diff --git a/boost/asio/ip/impl/network_v4.ipp b/boost/asio/ip/impl/network_v4.ipp index f59949d9f0..62f742c669 100644 --- a/boost/asio/ip/impl/network_v4.ipp +++ b/boost/asio/ip/impl/network_v4.ipp @@ -2,7 +2,7 @@ // ip/impl/network_v4.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -127,6 +127,7 @@ std::string network_v4::to_string() const std::string network_v4::to_string(boost::system::error_code& ec) const { + using namespace std; // For sprintf. ec = boost::system::error_code(); char prefix_len[16]; #if defined(BOOST_ASIO_HAS_SECURE_RTL) @@ -193,7 +194,7 @@ network_v4 make_network_v4(const std::string& str, return network_v4(addr, static_cast(prefix_len)); } -#if defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#if defined(BOOST_ASIO_HAS_STRING_VIEW) network_v4 make_network_v4(string_view str) { @@ -206,7 +207,7 @@ network_v4 make_network_v4(string_view str, return make_network_v4(static_cast(str), ec); } -#endif // defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#endif // defined(BOOST_ASIO_HAS_STRING_VIEW) } // namespace ip } // namespace asio diff --git a/boost/asio/ip/impl/network_v6.hpp b/boost/asio/ip/impl/network_v6.hpp index c6bac2d2db..1b13879ea3 100644 --- a/boost/asio/ip/impl/network_v6.hpp +++ b/boost/asio/ip/impl/network_v6.hpp @@ -2,7 +2,7 @@ // ip/impl/network_v6.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 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) diff --git a/boost/asio/ip/impl/network_v6.ipp b/boost/asio/ip/impl/network_v6.ipp index 2fb28a2fbc..426bc33b39 100644 --- a/boost/asio/ip/impl/network_v6.ipp +++ b/boost/asio/ip/impl/network_v6.ipp @@ -2,7 +2,7 @@ // ip/impl/network_v6.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com) // Copyright (c) 2014 Oliver Kowalke (oliver dot kowalke at gmail dot com) // // Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -96,6 +96,7 @@ std::string network_v6::to_string() const std::string network_v6::to_string(boost::system::error_code& ec) const { + using namespace std; // For sprintf. ec = boost::system::error_code(); char prefix_len[16]; #if defined(BOOST_ASIO_HAS_SECURE_RTL) @@ -162,7 +163,7 @@ network_v6 make_network_v6(const std::string& str, return network_v6(addr, static_cast(prefix_len)); } -#if defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#if defined(BOOST_ASIO_HAS_STRING_VIEW) network_v6 make_network_v6(string_view str) { @@ -175,7 +176,7 @@ network_v6 make_network_v6(string_view str, return make_network_v6(static_cast(str), ec); } -#endif // defined(BOOST_ASIO_HAS_STD_STRING_VIEW) +#endif // defined(BOOST_ASIO_HAS_STRING_VIEW) } // namespace ip } // namespace asio -- cgit v1.2.3