From 50a1eae942effb0a9b90724323ef8f2a67e7984a Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 16 Nov 2022 10:43:31 +0200 Subject: [PATCH] Change mpl::integral_c to boost::integral_constant to avoid Clang 16 errors when constructing out of range enums (refs #24, https://github.com/boostorg/mpl/issues/69) --- a/boost/boost_1_77_0/boost/numeric/conversion/detail/int_float_mixture.hpp +++ b/boost/boost_1_77_0/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 int2int_c ; - typedef mpl::integral_c int2float_c ; - typedef mpl::integral_c float2int_c ; - typedef mpl::integral_c float2float_c ; + typedef boost::integral_constant int2int_c ; + typedef boost::integral_constant int2float_c ; + typedef boost::integral_constant float2int_c ; + typedef boost::integral_constant float2float_c ; // Metafunction: // --- a/boost/boost_1_77_0/boost/numeric/conversion/detail/sign_mixture.hpp +++ b/boost/boost_1_77_0/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 unsig2unsig_c ; - typedef mpl::integral_c sig2sig_c ; - typedef mpl::integral_c sig2unsig_c ; - typedef mpl::integral_c unsig2sig_c ; + typedef boost::integral_constant unsig2unsig_c ; + typedef boost::integral_constant sig2sig_c ; + typedef boost::integral_constant sig2unsig_c ; + typedef boost::integral_constant unsig2sig_c ; // Metafunction: // --- a/boost/boost_1_77_0/boost/numeric/conversion/detail/udt_builtin_mixture.hpp +++ b/boost/boost_1_77_0/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 builtin2builtin_c ; - typedef mpl::integral_c builtin2udt_c ; - typedef mpl::integral_c udt2builtin_c ; - typedef mpl::integral_c udt2udt_c ; + typedef boost::integral_constant builtin2builtin_c ; + typedef boost::integral_constant builtin2udt_c ; + typedef boost::integral_constant udt2builtin_c ; + typedef boost::integral_constant udt2udt_c ; // Metafunction: //