Updating HPX to V1.2.1 (#5407)

This commit is contained in:
Hartmut Kaiser 2019-02-21 13:46:01 -06:00 committed by Codiferous
parent 45c48151d5
commit f2eea8f13a
3 changed files with 3 additions and 40 deletions

View File

@ -1,5 +1,5 @@
Source: hpx
Version: 1.2.0-1
Version: 1.2.1-0
Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
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.

View File

@ -1,36 +0,0 @@
diff --git a/hpx/exception.hpp b/hpx/exception.hpp
index 0c818088c7b..3eeaa579131 100644
--- a/hpx/exception.hpp
+++ b/hpx/exception.hpp
@@ -50,6 +50,12 @@ namespace hpx
/// Construct a hpx::exception from a boost#system_error.
explicit exception(boost::system::system_error const& e);
+ /// Construct a hpx::exception from a boost#system#error_code (this is
+ /// new for Boost V1.69). This constructor is required to compensate
+ /// for the changes introduced as a resolution to LWG3162
+ /// (https://cplusplus.github.io/LWG/issue3162).
+ explicit exception(boost::system::error_code const& e);
+
/// Construct a hpx::exception from a \a hpx::error and an error message.
///
/// \param e The parameter \p e holds the hpx::error code the new
diff --git a/src/exception.cpp b/src/exception.cpp
index 52c1cceba6b..cb6535fd008 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -89,6 +89,14 @@ namespace hpx
LERR_(error) << "created exception: " << this->what();
}
+ /// Construct a hpx::exception from a boost#system#error_code (this is
+ /// new for Boost V1.69).
+ exception::exception(boost::system::error_code const& e)
+ : boost::system::system_error(e)
+ {
+ LERR_(error) << "created exception: " << this->what();
+ }
+
/// Construct a hpx::exception from a \a hpx::error and an error message.
///
/// \param e The parameter \p e holds the hpx::error code the new

View File

@ -8,10 +8,9 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO STEllAR-GROUP/hpx
REF 1.2.0
SHA512 caf2650381856db6a96fd4b120975d94d68d9bb19ada1d6cd076abe2d4aa1418e410167f774a881d95eacd0d46bbd5f90f16a4c77b4a2cf00e5b24ea17bfe670
REF 1.2.1
SHA512 46e9e36cbd9bec935b2a1efce8167c641de88aca8e4dd9c2e3269a1d82ab2965812b5483b6dff4465634f454757b19ad4f73ddcc5ddd73d6efbf28d0819f7dc7
HEAD_REF master
PATCHES boost-1.69.patch
)
vcpkg_configure_cmake(