diff options
| author | yurybura <yurybura@gmail.com> | 2020-05-13 20:26:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 10:26:05 -0700 |
| commit | 24e8be5fcfddd0da98b58a63cd918849787fb06f (patch) | |
| tree | 328e0bd25684f1392419547c1b3360e06ba5845b /ports/boost-outcome | |
| parent | 597038559647776ee39d02dcf159da05d9342f1d (diff) | |
| download | vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.tar.gz vcpkg-24e8be5fcfddd0da98b58a63cd918849787fb06f.zip | |
[boost] update to 1.73.0 (#11221)
* [boost] update to 1.73
* [ompl] remove dependency to boost-disjoint-sets
* [libtorrent] include fixes from RC_1_2 branch
* [liblas] fix boost headers
* [freeopcua] fix std headers
* [pcl] fix build with Boost 1.73.0
* [hpx] fix build with Boost 1.73.0
* [libmysql] fix conflict with C++20 header <version>
* [boost-modular-build-helper] move port-specific b2 options to the file `<port_dir>/b2-options.cmake`
[boost-python] support Python2 (fixes #3495)
* [boost-python] remove Python executable from user-config
* [libtorrent] update version after merge
* [libtorrent] add boost-variant dependency
Diffstat (limited to 'ports/boost-outcome')
| -rw-r--r-- | ports/boost-outcome/0001-outcome-assert.patch | 11 | ||||
| -rw-r--r-- | ports/boost-outcome/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-outcome/portfile.cmake | 7 |
3 files changed, 15 insertions, 5 deletions
diff --git a/ports/boost-outcome/0001-outcome-assert.patch b/ports/boost-outcome/0001-outcome-assert.patch new file mode 100644 index 000000000..68ea5a50a --- /dev/null +++ b/ports/boost-outcome/0001-outcome-assert.patch @@ -0,0 +1,11 @@ +--- a/include/boost/outcome/experimental/status-code/status_code_ptr.hpp 2020-04-28 09:23:14.792565200 +0100 ++++ b/include/boost/outcome/experimental/status-code/status_code_ptr.hpp 2020-04-28 09:24:34.311741000 +0100 +@@ -103,7 +103,7 @@ + #endif + virtual void _do_erased_copy(status_code<void> &dst, const status_code<void> &src, size_t /*unused*/) const override // NOLINT + { +- assert(dst.domain() == *this); ++ // Note that dst will not have its domain set + assert(src.domain() == *this); + auto &d = static_cast<_mycode &>(dst); // NOLINT + const auto &_s = static_cast<const _mycode &>(src); // NOLINT diff --git a/ports/boost-outcome/CONTROL b/ports/boost-outcome/CONTROL index 2a04d14df..e0e798af4 100644 --- a/ports/boost-outcome/CONTROL +++ b/ports/boost-outcome/CONTROL @@ -1,6 +1,6 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-outcome
-Version: 1.72.0
+Version: 1.73.0
Build-Depends: boost-config, boost-throw-exception, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/outcome
Description: Boost outcome module
diff --git a/ports/boost-outcome/portfile.cmake b/ports/boost-outcome/portfile.cmake index b9e0d52d2..8a6a94a7c 100644 --- a/ports/boost-outcome/portfile.cmake +++ b/ports/boost-outcome/portfile.cmake @@ -1,13 +1,12 @@ # Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
-include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/outcome
- REF boost-1.72.0
- SHA512 3de487dfcdb07cbf3184cf7a75c4ce476ea905ee24bfb967dff30ec8b1b29e57f1d52858ec9ef3ed4f865696a2ce768aedea406bdf4e6147c631138ffa5d3858
+ REF boost-1.73.0
+ SHA512 992518afaea71cdf0531675f2c3bc5329c2ebd79b65998c1f774bd913d5135ccf48f2f831c3d9481e33375f7df3c637da45a3bd75298e1d6637d517793c8cb86
HEAD_REF master
+ PATCHES 0001-outcome-assert.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
|