aboutsummaryrefslogtreecommitdiff
path: root/ports/boost-variant
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2019-09-27 10:41:02 -0700
committerCurtis J Bezault <curtbezault@gmail.com>2019-09-27 10:41:02 -0700
commit9433136b22b5e443d550ca7665a562637c8a86b9 (patch)
treebf29de1962d1810f52e1d8537734ad3def9ea52d /ports/boost-variant
parent50b49af28a7ab619b341f3ba20d47592d302baab (diff)
downloadvcpkg-9433136b22b5e443d550ca7665a562637c8a86b9.tar.gz
vcpkg-9433136b22b5e443d550ca7665a562637c8a86b9.zip
[boost] Update to 1.71.0 (#7959)
* [boost] Update to 1.71.0 * [openmvs] Fixes for boost 1.71 * [telnetpp] DISABLE_PARALLEL_CONFIGURE * [execute_process] Fix output variables (like error_code) not getting populated * [telnetpp] Add missing boost-exception dependency * [boost] Refactor generate-ports.ps1 into scripts dir. Enable boost-thread on uwp. * [boost-iostreams] Revert removal of zstd dependency * [openmvs] Fix tools deployment
Diffstat (limited to 'ports/boost-variant')
-rw-r--r--ports/boost-variant/CONTROL2
-rw-r--r--ports/boost-variant/fix-regression-1.70.patch47
-rw-r--r--ports/boost-variant/portfile.cmake6
3 files changed, 3 insertions, 52 deletions
diff --git a/ports/boost-variant/CONTROL b/ports/boost-variant/CONTROL
index 5aec459fd..5497c4eff 100644
--- a/ports/boost-variant/CONTROL
+++ b/ports/boost-variant/CONTROL
@@ -1,6 +1,6 @@
# Automatically generated by boost-vcpkg-helpers/generate-ports.ps1
Source: boost-variant
-Version: 1.70.0
+Version: 1.71.0
Build-Depends: boost-assert, boost-bind, boost-config, boost-core, boost-detail, boost-functional, boost-integer, boost-move, boost-mpl, boost-preprocessor, boost-static-assert, boost-throw-exception, boost-type-index, boost-type-traits, boost-utility, boost-vcpkg-helpers
Homepage: https://github.com/boostorg/variant
Description: Boost variant module
diff --git a/ports/boost-variant/fix-regression-1.70.patch b/ports/boost-variant/fix-regression-1.70.patch
deleted file mode 100644
index 79c0e2c23..000000000
--- a/ports/boost-variant/fix-regression-1.70.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/include/boost/variant/detail/apply_visitor_unary.hpp b/include/boost/variant/detail/apply_visitor_unary.hpp
-index 71610cb..c3a741e 100644
---- a/include/boost/variant/detail/apply_visitor_unary.hpp
-+++ b/include/boost/variant/detail/apply_visitor_unary.hpp
-@@ -23,6 +23,7 @@
- # include <boost/mpl/size.hpp>
- # include <boost/utility/declval.hpp>
- # include <boost/core/enable_if.hpp>
-+# include <boost/type_traits/copy_cv_ref.hpp>
- # include <boost/type_traits/remove_reference.hpp>
- # include <boost/variant/detail/has_result_type.hpp>
- #endif
-@@ -85,7 +86,7 @@ namespace detail { namespace variant {
- // This class serves only metaprogramming purposes. none of its methods must be called at runtime!
- template <class Visitor, class Variant>
- struct result_multideduce1 {
-- typedef typename Variant::types types;
-+ typedef typename remove_reference<Variant>::type::types types;
- typedef typename boost::mpl::begin<types>::type begin_it;
- typedef typename boost::mpl::advance<
- begin_it, boost::mpl::int_<boost::mpl::size<types>::type::value - 1>
-@@ -95,14 +96,14 @@ struct result_multideduce1 {
- struct deduce_impl {
- typedef typename boost::mpl::next<It>::type next_t;
- typedef typename boost::mpl::deref<It>::type value_t;
-- typedef decltype(true ? boost::declval< Visitor& >()( boost::declval< value_t >() )
-+ typedef decltype(true ? boost::declval< Visitor& >()( boost::declval< copy_cv_ref_t< value_t, Variant > >() )
- : boost::declval< typename deduce_impl<next_t>::type >()) type;
- };
-
- template <class Dummy>
- struct deduce_impl<last_it, Dummy> {
- typedef typename boost::mpl::deref<last_it>::type value_t;
-- typedef decltype(boost::declval< Visitor& >()( boost::declval< value_t >() )) type;
-+ typedef decltype(boost::declval< Visitor& >()( boost::declval< copy_cv_ref_t< value_t, Variant > >() )) type;
- };
-
- typedef typename deduce_impl<begin_it>::type type;
-@@ -132,7 +133,7 @@ inline decltype(auto) apply_visitor(Visitor&& visitor, Visitable&& visitable,
- boost::detail::variant::has_result_type<Visitor>
- >::type* = 0)
- {
-- boost::detail::variant::result_wrapper1<Visitor, typename remove_reference<Visitable>::type> cpp14_vis(::boost::forward<Visitor>(visitor));
-+ boost::detail::variant::result_wrapper1<Visitor, Visitable> cpp14_vis(::boost::forward<Visitor>(visitor));
- return ::boost::forward<Visitable>(visitable).apply_visitor(cpp14_vis);
- }
-
diff --git a/ports/boost-variant/portfile.cmake b/ports/boost-variant/portfile.cmake
index a1d8be528..f853efe80 100644
--- a/ports/boost-variant/portfile.cmake
+++ b/ports/boost-variant/portfile.cmake
@@ -5,11 +5,9 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO boostorg/variant
- REF boost-1.70.0
- SHA512 e5a555c666bd692a5ed6e556a66d93db82707357ae5f7e62af8565e5bf56b134adefb3049c38af72f420a969308f120b8270a9e9187eac984b74573b8e9e1d75
+ REF boost-1.71.0
+ SHA512 5847a32be903eba91f9532fe50b6d9a12d20e0d9378330a853df66caace875a83de86018bf77bcdc5047de1345da43aeabc746daa8d843be331a55d78c1137dc
HEAD_REF master
- PATCHES
- fix-regression-1.70.patch
)
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)