Skip to content

Commit 50a1eae

Browse files
committed
Change mpl::integral_c to boost::integral_constant to avoid Clang 16 errors when constructing out of range enums (refs #24, boostorg/mpl#69)
1 parent 7c846dd commit 50a1eae

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

include/boost/numeric/conversion/detail/int_float_mixture.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
#include "boost/numeric/conversion/int_float_mixture_enum.hpp"
1717
#include "boost/numeric/conversion/detail/meta.hpp"
1818

19-
#include "boost/mpl/integral_c.hpp"
19+
#include "boost/type_traits/integral_constant.hpp"
2020

2121
namespace boost { namespace numeric { namespace convdetail
2222
{
2323
// Integral Constants for 'IntFloatMixture'
24-
typedef mpl::integral_c<int_float_mixture_enum, integral_to_integral> int2int_c ;
25-
typedef mpl::integral_c<int_float_mixture_enum, integral_to_float> int2float_c ;
26-
typedef mpl::integral_c<int_float_mixture_enum, float_to_integral> float2int_c ;
27-
typedef mpl::integral_c<int_float_mixture_enum, float_to_float> float2float_c ;
24+
typedef boost::integral_constant<int_float_mixture_enum, integral_to_integral> int2int_c ;
25+
typedef boost::integral_constant<int_float_mixture_enum, integral_to_float> int2float_c ;
26+
typedef boost::integral_constant<int_float_mixture_enum, float_to_integral> float2int_c ;
27+
typedef boost::integral_constant<int_float_mixture_enum, float_to_float> float2float_c ;
2828

2929
// Metafunction:
3030
//

include/boost/numeric/conversion/detail/sign_mixture.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
#include "boost/numeric/conversion/sign_mixture_enum.hpp"
1717
#include "boost/numeric/conversion/detail/meta.hpp"
1818

19-
#include "boost/mpl/integral_c.hpp"
19+
#include "boost/type_traits/integral_constant.hpp"
2020

2121
namespace boost { namespace numeric { namespace convdetail
2222
{
2323
// Integral Constants for 'SignMixture'
24-
typedef mpl::integral_c<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ;
25-
typedef mpl::integral_c<sign_mixture_enum, signed_to_signed> sig2sig_c ;
26-
typedef mpl::integral_c<sign_mixture_enum, signed_to_unsigned> sig2unsig_c ;
27-
typedef mpl::integral_c<sign_mixture_enum, unsigned_to_signed> unsig2sig_c ;
24+
typedef boost::integral_constant<sign_mixture_enum, unsigned_to_unsigned> unsig2unsig_c ;
25+
typedef boost::integral_constant<sign_mixture_enum, signed_to_signed> sig2sig_c ;
26+
typedef boost::integral_constant<sign_mixture_enum, signed_to_unsigned> sig2unsig_c ;
27+
typedef boost::integral_constant<sign_mixture_enum, unsigned_to_signed> unsig2sig_c ;
2828

2929
// Metafunction:
3030
//

include/boost/numeric/conversion/detail/udt_builtin_mixture.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
#include "boost/numeric/conversion/udt_builtin_mixture_enum.hpp"
1616
#include "boost/numeric/conversion/detail/meta.hpp"
1717

18-
#include "boost/mpl/integral_c.hpp"
18+
#include "boost/type_traits/integral_constant.hpp"
1919

2020
namespace boost { namespace numeric { namespace convdetail
2121
{
2222
// Integral Constants for 'UdtMixture'
23-
typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ;
24-
typedef mpl::integral_c<udt_builtin_mixture_enum, builtin_to_udt> builtin2udt_c ;
25-
typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_builtin> udt2builtin_c ;
26-
typedef mpl::integral_c<udt_builtin_mixture_enum, udt_to_udt> udt2udt_c ;
23+
typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_builtin> builtin2builtin_c ;
24+
typedef boost::integral_constant<udt_builtin_mixture_enum, builtin_to_udt> builtin2udt_c ;
25+
typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_builtin> udt2builtin_c ;
26+
typedef boost::integral_constant<udt_builtin_mixture_enum, udt_to_udt> udt2udt_c ;
2727

2828
// Metafunction:
2929
//

0 commit comments

Comments
 (0)