From a180b490f26b0a970f68c70b322f4ad3666b0d78 Mon Sep 17 00:00:00 2001 From: Nick Thompson Date: Wed, 12 Sep 2018 10:20:05 -0600 Subject: [PATCH 1/2] Remove deprecation warning from the BOOST_BIG_ENDIAN and BOOST_LITTLE_ENDIAN macros. --- .../special_functions/detail/fp_traits.hpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/boost/math/special_functions/detail/fp_traits.hpp b/include/boost/math/special_functions/detail/fp_traits.hpp index c95702222..17a6273a7 100644 --- a/include/boost/math/special_functions/detail/fp_traits.hpp +++ b/include/boost/math/special_functions/detail/fp_traits.hpp @@ -24,7 +24,7 @@ With these techniques, the code could be simplified. #include #include -#include +#include #include #include @@ -51,9 +51,9 @@ With these techniques, the code could be simplified. && (_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC != 0)) # ifdef _STLP_VENDOR_CSTD # if _STLPORT_VERSION >= 0x520 -# define BOOST_FPCLASSIFY_PREFIX ::__std_alias:: +# define BOOST_FPCLASSIFY_PREFIX ::__std_alias:: # else -# define BOOST_FPCLASSIFY_PREFIX ::_STLP_VENDOR_CSTD:: +# define BOOST_FPCLASSIFY_PREFIX ::_STLP_VENDOR_CSTD:: # endif # else # define BOOST_FPCLASSIFY_PREFIX ::std:: @@ -84,7 +84,7 @@ namespace detail { //------------------------------------------------------------------------------ -/* +/* The following classes are used to tag the different methods that are used for floating point classification */ @@ -216,9 +216,9 @@ template<> struct fp_traits_non_native private: -#if defined(BOOST_BIG_ENDIAN) +#if defined(BOOST_ENDIAN_BIG_BYTE) BOOST_STATIC_CONSTANT(int, offset_ = 0); -#elif defined(BOOST_LITTLE_ENDIAN) +#elif defined(BOOST_ENDIAN_LITTLE_BYTE) BOOST_STATIC_CONSTANT(int, offset_ = 4); #else BOOST_STATIC_ASSERT(false); @@ -276,9 +276,9 @@ template<> struct fp_traits_non_native private: -#if defined(BOOST_BIG_ENDIAN) +#if defined(BOOST_ENDIAN_BIG_BYTE) BOOST_STATIC_CONSTANT(int, offset_ = 0); -#elif defined(BOOST_LITTLE_ENDIAN) +#elif defined(BOOST_ENDIAN_LITTLE_BYTE) BOOST_STATIC_CONSTANT(int, offset_ = 4); #else BOOST_STATIC_ASSERT(false); @@ -390,9 +390,9 @@ struct fp_traits_non_native private: -#if defined(BOOST_BIG_ENDIAN) +#if defined(BOOST_ENDIAN_BIG_BYTE) BOOST_STATIC_CONSTANT(int, offset_ = 0); -#elif defined(BOOST_LITTLE_ENDIAN) +#elif defined(BOOST_ENDIAN_LITTLE_BYTE) BOOST_STATIC_CONSTANT(int, offset_ = 12); #else BOOST_STATIC_ASSERT(false); @@ -471,9 +471,9 @@ struct fp_traits_non_native private: -#if defined(BOOST_BIG_ENDIAN) +#if defined(BOOST_ENDIAN_BIG_BYTE) BOOST_STATIC_CONSTANT(int, offset_ = 0); -#elif defined(BOOST_LITTLE_ENDIAN) +#elif defined(BOOST_ENDIAN_LITTLE_BYTE) BOOST_STATIC_CONSTANT(int, offset_ = 12); #else BOOST_STATIC_ASSERT(false); @@ -557,7 +557,7 @@ struct select_native && !defined(BOOST_MATH_DISABLE_STD_FPCLASSIFY)\ && !defined(BOOST_INTEL)\ && !defined(sun)\ - && !defined(__VXWORKS__) + && !defined(__VXWORKS__) # define BOOST_MATH_USE_STD_FPCLASSIFY #endif From 6ec5838685519e9dcd9d9879b6040b35dc1f17d6 Mon Sep 17 00:00:00 2001 From: Nick Thompson Date: Wed, 12 Sep 2018 11:37:31 -0600 Subject: [PATCH 2/2] Change #if defined(BOOST_ENDIAN_*_BYTE) to #if BOOST_ENDIAN_*_BYTE on the advice of code review from pdimov. --- .../math/special_functions/detail/fp_traits.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/boost/math/special_functions/detail/fp_traits.hpp b/include/boost/math/special_functions/detail/fp_traits.hpp index 17a6273a7..013f830bc 100644 --- a/include/boost/math/special_functions/detail/fp_traits.hpp +++ b/include/boost/math/special_functions/detail/fp_traits.hpp @@ -216,9 +216,9 @@ template<> struct fp_traits_non_native private: -#if defined(BOOST_ENDIAN_BIG_BYTE) +#if BOOST_ENDIAN_BIG_BYTE BOOST_STATIC_CONSTANT(int, offset_ = 0); -#elif defined(BOOST_ENDIAN_LITTLE_BYTE) +#elif BOOST_ENDIAN_LITTLE_BYTE BOOST_STATIC_CONSTANT(int, offset_ = 4); #else BOOST_STATIC_ASSERT(false); @@ -276,9 +276,9 @@ template<> struct fp_traits_non_native private: -#if defined(BOOST_ENDIAN_BIG_BYTE) +#if BOOST_ENDIAN_BIG_BYTE BOOST_STATIC_CONSTANT(int, offset_ = 0); -#elif defined(BOOST_ENDIAN_LITTLE_BYTE) +#elif BOOST_ENDIAN_LITTLE_BYTE BOOST_STATIC_CONSTANT(int, offset_ = 4); #else BOOST_STATIC_ASSERT(false); @@ -390,9 +390,9 @@ struct fp_traits_non_native private: -#if defined(BOOST_ENDIAN_BIG_BYTE) +#if BOOST_ENDIAN_BIG_BYTE BOOST_STATIC_CONSTANT(int, offset_ = 0); -#elif defined(BOOST_ENDIAN_LITTLE_BYTE) +#elif BOOST_ENDIAN_LITTLE_BYTE BOOST_STATIC_CONSTANT(int, offset_ = 12); #else BOOST_STATIC_ASSERT(false); @@ -471,9 +471,9 @@ struct fp_traits_non_native private: -#if defined(BOOST_ENDIAN_BIG_BYTE) +#if BOOST_ENDIAN_BIG_BYTE BOOST_STATIC_CONSTANT(int, offset_ = 0); -#elif defined(BOOST_ENDIAN_LITTLE_BYTE) +#elif BOOST_ENDIAN_LITTLE_BYTE BOOST_STATIC_CONSTANT(int, offset_ = 12); #else BOOST_STATIC_ASSERT(false);