summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boost-1-fixes.patch46
1 files changed, 44 insertions, 2 deletions
diff --git a/src/boost-1-fixes.patch b/src/boost-1-fixes.patch
index 4816ef4..7997d43 100644
--- a/src/boost-1-fixes.patch
+++ b/src/boost-1-fixes.patch
@@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: xantares <xantares09@hotmail.com>
Date: Mon, 28 Sep 2015 08:21:42 +0000
-Subject: [PATCH 1/2] Fix {make,jump}_fcontext visibility with mingw
+Subject: [PATCH 1/3] Fix {make,jump}_fcontext visibility with mingw
taken from: https://github.com/boostorg/context/pull/22
@@ -57,7 +57,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 28 Feb 2018 19:43:45 +1100
-Subject: [PATCH 2/2] fast-forward asio/ssl from 1.62 release
+Subject: [PATCH 2/3] fast-forward asio/ssl from 1.62 release
diff --git a/boost/asio/ssl/detail/impl/engine.ipp b/boost/asio/ssl/detail/impl/engine.ipp
@@ -546,3 +546,45 @@ index 1111111..2222222 100644
} // namespace asio
} // namespace boost
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: jzmaddock <john@johnmaddock.co.uk>
+Date: Fri, 24 Jul 2015 18:50:28 +0100
+Subject: [PATCH 3/3] Remove depricated type_traits usage.
+
+curl -L 'https://patch-diff.githubusercontent.com/raw/boostorg/iostreams/pull/15.patch' | sed 's,include/,,g' | git am
+
+diff --git a/boost/iostreams/detail/is_dereferenceable.hpp b/boost/iostreams/detail/is_dereferenceable.hpp
+index 1111111..2222222 100644
+--- a/boost/iostreams/detail/is_dereferenceable.hpp
++++ b/boost/iostreams/detail/is_dereferenceable.hpp
+@@ -9,9 +9,8 @@
+ #ifndef BOOST_IOSTREAMS_DETAIL_IS_DEREFERENCEABLE_HPP_INCLUDED
+ #define BOOST_IOSTREAMS_DETAIL_IS_DEREFERENCEABLE_HPP_INCLUDED
+
+-# include <boost/type_traits/detail/bool_trait_def.hpp>
+-# include <boost/type_traits/detail/template_arity_spec.hpp>
+ # include <boost/type_traits/remove_cv.hpp>
++# include <boost/type_traits/integral_constant.hpp>
+ # include <boost/mpl/aux_/lambda_support.hpp>
+ # include <boost/mpl/bool.hpp>
+ # include <boost/detail/workaround.hpp>
+@@ -69,17 +68,10 @@ namespace is_dereferenceable_
+ # undef BOOST_comma
+
+ template<typename T>
+-struct is_dereferenceable
+- BOOST_TT_AUX_BOOL_C_BASE(is_dereferenceable_::impl<T>::value)
+-{
+- BOOST_TT_AUX_BOOL_TRAIT_VALUE_DECL(is_dereferenceable_::impl<T>::value)
+- BOOST_MPL_AUX_LAMBDA_SUPPORT(1,is_dereferenceable,(T))
+-};
++struct is_dereferenceable : public boost::integral_constant<bool, is_dereferenceable_::impl<T>::value> {};
+
+ } }
+
+-BOOST_TT_AUX_TEMPLATE_ARITY_SPEC(1, ::boost::iostreams::detail::is_dereferenceable)
+-
+ } // End namespaces detail, iostreams, boost.
+
+ #endif // BOOST_IOSTREAMS_DETAIL_IS_DEREFERENCEABLE_HPP_INCLUDED