-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
boost: Fix compilation errors with newer Clang
- Loading branch information
Showing
2 changed files
with
149 additions
and
0 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
89 changes: 89 additions & 0 deletions
89
recipes/boost/all/patches/boost_build-with-newer-clang.patch
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,89 @@ | ||
| diff --git a/boost/numeric/conversion/detail/int_float_mixture.hpp b/boost/numeric/conversion/detail/int_float_mixture.hpp | ||
| index 464e527..7690d07 100644 | ||
| --- a/boost/numeric/conversion/detail/int_float_mixture.hpp | ||
| +++ b/boost/numeric/conversion/detail/int_float_mixture.hpp | ||
| @@ -16,15 +16,15 @@ | ||
| #include "boost/numeric/conversion/int_float_mixture_enum.hpp" | ||
| #include "boost/numeric/conversion/detail/meta.hpp" | ||
|
|
||
| -#include "boost/mpl/integral_c.hpp" | ||
| +#include "boost/type_traits/integral_constant.hpp" | ||
|
|
||
| namespace boost { namespace numeric { namespace convdetail | ||
| { | ||
| // Integral Constants for 'IntFloatMixture' | ||
| - typedef mpl::integral_c<int_float_mixture_enum, integral_to_integral> int2int_c ; | ||
| - typedef mpl::integral_c<int_float_mixture_enum, integral_to_float> int2float_c ; | ||
| - typedef mpl::integral_c<int_float_mixture_enum, float_to_integral> float2int_c ; | ||
| - typedef mpl::integral_c<int_float_mixture_enum, float_to_float> float2float_c ; | ||
| + typedef boost::integral_constant<int_float_mixture_enum, integral_to_integral> int2int_c ; | ||
| + typedef boost::integral_constant<int_float_mixture_enum, integral_to_float> int2float_c ; | ||
| + typedef boost::integral_constant<int_float_mixture_enum, float_to_integral> float2int_c ; | ||
| + typedef boost::integral_constant<int_float_mixture_enum, float_to_float> float2float_c ; | ||
|
|
||
| // Metafunction: | ||
| // | ||
| diff --git a/boost/numeric/conversion/detail/sign_mixture.hpp b/boost/numeric/conversion/detail/sign_mixture.hpp | ||
| index c7f9e42..fde1584 100644 | ||
| --- a/boost/numeric/conversion/detail/sign_mixture.hpp | ||
| +++ b/boost/numeric/conversion/detail/sign_mixture.hpp | ||
| @@ -16,15 +16,15 @@ | ||
| #include "boost/numeric/conversion/sign_mixture_enum.hpp" | ||
| #include "boost/numeric/conversion/detail/meta.hpp" | ||
|
|
||
| -#include "boost/mpl/integral_c.hpp" | ||
| +#include "boost/type_traits/integral_constant.hpp" | ||
|
|
||
| namespace boost { namespace numeric { namespace convdetail | ||
| { | ||
| // Integral Constants for 'SignMixture' | ||
| - typedef mpl::integral_c<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ; | ||
| - typedef mpl::integral_c<sign_mixture_enum, signed_to_signed> sig2sig_c ; | ||
| - typedef mpl::integral_c<sign_mixture_enum, signed_to_unsigned> sig2unsig_c ; | ||
| - typedef mpl::integral_c<sign_mixture_enum, unsigned_to_signed> unsig2sig_c ; | ||
| + typedef boost::integral_constant<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ; | ||
| + typedef boost::integral_constant<sign_mixture_enum, signed_to_signed> sig2sig_c ; | ||
| + typedef boost::integral_constant<sign_mixture_enum, signed_to_unsigned> sig2unsig_c ; | ||
| + typedef boost::integral_constant<sign_mixture_enum, unsigned_to_signed> unsig2sig_c ; | ||
|
|
||
| // Metafunction: | ||
| // | ||
| diff --git a/boost/numeric/conversion/detail/udt_builtin_mixture.hpp b/boost/numeric/conversion/detail/udt_builtin_mixture.hpp | ||
| index 36dbc49..a39d29f 100644 | ||
| --- a/boost/numeric/conversion/detail/udt_builtin_mixture.hpp | ||
| +++ b/boost/numeric/conversion/detail/udt_builtin_mixture.hpp | ||
| @@ -15,15 +15,15 @@ | ||
| #include "boost/numeric/conversion/udt_builtin_mixture_enum.hpp" | ||
| #include "boost/numeric/conversion/detail/meta.hpp" | ||
|
|
||
| -#include "boost/mpl/integral_c.hpp" | ||
| +#include "boost/type_traits/integral_constant.hpp" | ||
|
|
||
| namespace boost { namespace numeric { namespace convdetail | ||
| { | ||
| // Integral Constants for 'UdtMixture' | ||
| - typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ; | ||
| - typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_udt> builtin2udt_c ; | ||
| - typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_builtin> udt2builtin_c ; | ||
| - typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_udt> udt2udt_c ; | ||
| + typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ; | ||
| + typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_udt> builtin2udt_c ; | ||
| + typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_builtin> udt2builtin_c ; | ||
| + typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_udt> udt2udt_c ; | ||
|
|
||
| // Metafunction: | ||
| // | ||
| diff --git a/boost/mpl/aux_/integral_wrapper.hpp b/boost/mpl/aux_/integral_wrapper.hpp | ||
| index 8748fbb93..5f24b7949 100644 | ||
| --- a/boost/mpl/aux_/integral_wrapper.hpp | ||
| +++ b/boost/mpl/aux_/integral_wrapper.hpp | ||
| @@ -56,7 +56,8 @@ struct AUX_WRAPPER_NAME | ||
| // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC), | ||
| // while some other don't like 'value + 1' (Borland), and some don't like | ||
| // either | ||
| -#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) | ||
| +#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243) \ | ||
| + || __cplusplus >= 201103L | ||
| private: | ||
| BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1))); | ||
| BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1))); |