diff options
Diffstat (limited to '3rdparty/asio/include/asio/detail/impl/throw_error.ipp')
-rw-r--r-- | 3rdparty/asio/include/asio/detail/impl/throw_error.ipp | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/3rdparty/asio/include/asio/detail/impl/throw_error.ipp b/3rdparty/asio/include/asio/detail/impl/throw_error.ipp index d59eca2d8e2..7baf3e729e5 100644 --- a/3rdparty/asio/include/asio/detail/impl/throw_error.ipp +++ b/3rdparty/asio/include/asio/detail/impl/throw_error.ipp @@ -2,7 +2,7 @@ // detail/impl/throw_error.ipp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2024 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,7 +17,6 @@ #include "asio/detail/config.hpp" #include "asio/detail/throw_error.hpp" -#include "asio/detail/throw_exception.hpp" #include "asio/system_error.hpp" #include "asio/detail/push_options.hpp" @@ -25,31 +24,21 @@ namespace asio { namespace detail { -void do_throw_error(const asio::error_code& err) +void do_throw_error( + const asio::error_code& err + ASIO_SOURCE_LOCATION_PARAM) { asio::system_error e(err); - asio::detail::throw_exception(e); + asio::detail::throw_exception(e ASIO_SOURCE_LOCATION_ARG); } -void do_throw_error(const asio::error_code& err, const char* location) +void do_throw_error( + const asio::error_code& err, + const char* location + ASIO_SOURCE_LOCATION_PARAM) { - // boostify: non-boost code starts here -#if defined(ASIO_MSVC) && defined(ASIO_HAS_STD_SYSTEM_ERROR) - // Microsoft's implementation of std::system_error is non-conformant in that - // it ignores the error code's message when a "what" string is supplied. We'll - // work around this by explicitly formatting the "what" string. - std::string what_msg = location; - what_msg += ": "; - what_msg += err.message(); - asio::system_error e(err, what_msg); - asio::detail::throw_exception(e); -#else // defined(ASIO_MSVC) && defined(ASIO_HAS_STD_SYSTEM_ERROR) - // boostify: non-boost code ends here asio::system_error e(err, location); - asio::detail::throw_exception(e); - // boostify: non-boost code starts here -#endif // defined(ASIO_MSVC) && defined(ASIO_HAS_STD_SYSTEM_ERROR) - // boostify: non-boost code ends here + asio::detail::throw_exception(e ASIO_SOURCE_LOCATION_ARG); } } // namespace detail |