diff options
Diffstat (limited to 'src/third_party/asio-master/asio/include/asio/ip/impl')
12 files changed, 22 insertions, 16 deletions
diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/address.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/address.hpp index c64fb023723..6e2eee7bcac 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address.hpp @@ -2,7 +2,7 @@ // ip/impl/address.hpp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/address.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/address.ipp index c558d9a0a4f..f63b6264a80 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address.ipp @@ -2,7 +2,7 @@ // ip/impl/address.ipp // ~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.hpp index 1897fd2675f..91532133b27 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.hpp @@ -2,7 +2,7 @@ // ip/impl/address_v4.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.ipp index 09439eb16c2..9afdc303147 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v4.ipp @@ -2,7 +2,7 @@ // ip/impl/address_v4.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.hpp index 407d9c1802e..d9ada719cee 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.hpp @@ -2,7 +2,7 @@ // ip/impl/address_v6.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.ipp index 79025aed7d4..1bfa71bf72c 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/address_v6.ipp @@ -2,7 +2,7 @@ // ip/impl/address_v6.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/basic_endpoint.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/basic_endpoint.hpp index c1a29a8a4eb..3c283ae55e4 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/basic_endpoint.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/basic_endpoint.hpp @@ -2,7 +2,7 @@ // ip/impl/basic_endpoint.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/host_name.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/host_name.ipp index a1f8a0d331f..47a3f5f4b9e 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/host_name.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/host_name.ipp @@ -2,7 +2,7 @@ // ip/impl/host_name.ipp // ~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.hpp index 34c03fdd378..857eeee2d11 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.hpp @@ -2,7 +2,7 @@ // ip/impl/network_v4.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.ipp index ec39aae1c04..52eecdafcd9 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v4.ipp @@ -2,7 +2,7 @@ // ip/impl/network_v4.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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 @@ -178,8 +178,11 @@ network_v4 make_network_v4(const std::string& str, return network_v4(); } - return network_v4(make_address_v4(str.substr(0, pos)), - std::atoi(str.substr(pos + 1).c_str())); + const address_v4 addr = make_address_v4(str.substr(0, pos), ec); + if (ec) + return network_v4(); + + return network_v4(addr, std::atoi(str.substr(pos + 1).c_str())); } #if defined(ASIO_HAS_STD_STRING_VIEW) diff --git a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.hpp b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.hpp index 03b9ed899eb..df4dccb6797 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.hpp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.hpp @@ -2,7 +2,7 @@ // ip/impl/network_v6.hpp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.ipp b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.ipp index c2418e3e955..c4845c31a93 100644 --- a/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.ipp +++ b/src/third_party/asio-master/asio/include/asio/ip/impl/network_v6.ipp @@ -2,7 +2,7 @@ // ip/impl/network_v6.ipp // ~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2017 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 @@ -147,8 +147,11 @@ network_v6 make_network_v6(const std::string& str, return network_v6(); } - return network_v6(make_address_v6(str.substr(0, pos)), - std::atoi(str.substr(pos + 1).c_str())); + const address_v6 addr = make_address_v6(str.substr(0, pos), ec); + if (ec) + return network_v6(); + + return network_v6(addr, std::atoi(str.substr(pos + 1).c_str())); } #if defined(ASIO_HAS_STD_STRING_VIEW) |