1 From 50a1eae942effb0a9b90724323ef8f2a67e7984a Mon Sep 17 00:00:00 2001
2 From: Peter Dimov <pdimov@gmail.com>
3 Date: Wed, 16 Nov 2022 10:43:31 +0200
4 Subject: [PATCH] Change mpl::integral_c to boost::integral_constant to avoid
5 Clang 16 errors when constructing out of range enums (refs #24,
6 https://github.com/boostorg/mpl/issues/69)
9 .../numeric/conversion/detail/int_float_mixture.hpp | 10 +++++-----
10 .../boost/numeric/conversion/detail/sign_mixture.hpp | 10 +++++-----
11 .../numeric/conversion/detail/udt_builtin_mixture.hpp | 10 +++++-----
12 3 files changed, 15 insertions(+), 15 deletions(-)
14 diff --git a/include/boost/numeric/conversion/detail/int_float_mixture.hpp b/include/boost/numeric/conversion/detail/int_float_mixture.hpp
15 index 464e527..7690d07 100644
16 --- a/include/boost/numeric/conversion/detail/int_float_mixture.hpp
17 +++ b/include/boost/numeric/conversion/detail/int_float_mixture.hpp
19 #include "boost/numeric/conversion/int_float_mixture_enum.hpp"
20 #include "boost/numeric/conversion/detail/meta.hpp"
22 -#include "boost/mpl/integral_c.hpp"
23 +#include "boost/type_traits/integral_constant.hpp"
25 namespace boost { namespace numeric { namespace convdetail
27 // Integral Constants for 'IntFloatMixture'
28 - typedef mpl::integral_c<int_float_mixture_enum, integral_to_integral> int2int_c ;
29 - typedef mpl::integral_c<int_float_mixture_enum, integral_to_float> int2float_c ;
30 - typedef mpl::integral_c<int_float_mixture_enum, float_to_integral> float2int_c ;
31 - typedef mpl::integral_c<int_float_mixture_enum, float_to_float> float2float_c ;
32 + typedef boost::integral_constant<int_float_mixture_enum, integral_to_integral> int2int_c ;
33 + typedef boost::integral_constant<int_float_mixture_enum, integral_to_float> int2float_c ;
34 + typedef boost::integral_constant<int_float_mixture_enum, float_to_integral> float2int_c ;
35 + typedef boost::integral_constant<int_float_mixture_enum, float_to_float> float2float_c ;
39 diff --git a/include/boost/numeric/conversion/detail/sign_mixture.hpp b/include/boost/numeric/conversion/detail/sign_mixture.hpp
40 index c7f9e42..fde1584 100644
41 --- a/include/boost/numeric/conversion/detail/sign_mixture.hpp
42 +++ b/include/boost/numeric/conversion/detail/sign_mixture.hpp
44 #include "boost/numeric/conversion/sign_mixture_enum.hpp"
45 #include "boost/numeric/conversion/detail/meta.hpp"
47 -#include "boost/mpl/integral_c.hpp"
48 +#include "boost/type_traits/integral_constant.hpp"
50 namespace boost { namespace numeric { namespace convdetail
52 // Integral Constants for 'SignMixture'
53 - typedef mpl::integral_c<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ;
54 - typedef mpl::integral_c<sign_mixture_enum, signed_to_signed> sig2sig_c ;
55 - typedef mpl::integral_c<sign_mixture_enum, signed_to_unsigned> sig2unsig_c ;
56 - typedef mpl::integral_c<sign_mixture_enum, unsigned_to_signed> unsig2sig_c ;
57 + typedef boost::integral_constant<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ;
58 + typedef boost::integral_constant<sign_mixture_enum, signed_to_signed> sig2sig_c ;
59 + typedef boost::integral_constant<sign_mixture_enum, signed_to_unsigned> sig2unsig_c ;
60 + typedef boost::integral_constant<sign_mixture_enum, unsigned_to_signed> unsig2sig_c ;
64 diff --git a/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp b/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
65 index 36dbc49..a39d29f 100644
66 --- a/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
67 +++ b/include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp
69 #include "boost/numeric/conversion/udt_builtin_mixture_enum.hpp"
70 #include "boost/numeric/conversion/detail/meta.hpp"
72 -#include "boost/mpl/integral_c.hpp"
73 +#include "boost/type_traits/integral_constant.hpp"
75 namespace boost { namespace numeric { namespace convdetail
77 // Integral Constants for 'UdtMixture'
78 - typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ;
79 - typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_udt> builtin2udt_c ;
80 - typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_builtin> udt2builtin_c ;
81 - typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_udt> udt2udt_c ;
82 + typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ;
83 + typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_udt> builtin2udt_c ;
84 + typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_builtin> udt2builtin_c ;
85 + typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_udt> udt2udt_c ;
90 2.37.1 (Apple Git-137.1)