mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 08:17:49 +08:00
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
|
diff --git a/src/util/asio_util.cpp b/src/util/asio_util.cpp
|
||
|
|
index e2207de..48a35b9 100644
|
||
|
|
--- a/src/util/asio_util.cpp
|
||
|
|
+++ b/src/util/asio_util.cpp
|
||
|
|
@@ -231,7 +231,7 @@ namespace hpx { namespace util
|
||
|
|
tcp::endpoint ep;
|
||
|
|
if (util::get_endpoint(address, port, ep))
|
||
|
|
{
|
||
|
|
- return endpoint_iterator_type(tcp::resolver::iterator::create(
|
||
|
|
+ return endpoint_iterator_type(tcp::resolver::results_type::create(
|
||
|
|
ep, address, port_str));
|
||
|
|
}
|
||
|
|
}
|
||
|
|
@@ -283,7 +283,7 @@ namespace hpx { namespace util
|
||
|
|
if (util::get_endpoint(address, port, ep))
|
||
|
|
{
|
||
|
|
return endpoint_iterator_type(
|
||
|
|
- tcp::resolver::iterator::create(ep, address, port_str));
|
||
|
|
+ tcp::resolver::results_type::create(ep, address, port_str));
|
||
|
|
}
|
||
|
|
}
|
||
|
|
catch (boost::system::system_error const&) {
|
||
|
|
diff --git a/src/util/serialize_exception.cpp b/src/util/serialize_exception.cpp
|
||
|
|
index 935e575..22bcf37 100644
|
||
|
|
--- a/src/util/serialize_exception.cpp
|
||
|
|
+++ b/src/util/serialize_exception.cpp
|
||
|
|
@@ -341,11 +341,7 @@ namespace hpx { namespace serialization
|
||
|
|
case hpx::util::boost_system_error:
|
||
|
|
e = hpx::detail::construct_exception(
|
||
|
|
boost::system::system_error(err_value,
|
||
|
|
-#ifndef BOOST_SYSTEM_NO_DEPRECATED
|
||
|
|
- boost::system::get_system_category()
|
||
|
|
-#else
|
||
|
|
boost::system::system_category()
|
||
|
|
-#endif
|
||
|
|
, err_message
|
||
|
|
)
|
||
|
|
, throw_function_, throw_file_, throw_line_, throw_back_trace_,
|