-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[hpx] Handle boost breaking changes. Fixes #2416.
- Loading branch information
1 parent
4e6678b
commit 1e7b704
Showing
3 changed files
with
50 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
Source: hpx | ||
Version: 1.0.0-6 | ||
Version: 1.0.0-7 | ||
Build-Depends: hwloc, boost-chrono, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread, boost-context, boost-iostreams, boost-random, boost-atomic, boost-asio, boost-dynamic-bitset, boost-assign, boost-format, boost-signals2, boost-parameter, boost-bimap, boost-accumulators, boost-lockfree, boost-icl | ||
Description: The C++ Standards Library for Concurrency and Parallelism | ||
HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
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_, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters