From 05271ba3be769eb4a41706f6a7aeea5ab52e037d Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sun, 3 Apr 2016 18:49:59 +0100 Subject: [PATCH] Fix PP-logic for clang/win and Intel/Win. See https://gist.github.com/dodheim/918e9dc480fe39e590c3af2ceb706e1b. --- include/boost/multiprecision/detail/bitscan.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/multiprecision/detail/bitscan.hpp b/include/boost/multiprecision/detail/bitscan.hpp index ce1cdc8d..a21fd586 100644 --- a/include/boost/multiprecision/detail/bitscan.hpp +++ b/include/boost/multiprecision/detail/bitscan.hpp @@ -8,8 +8,8 @@ #ifndef BOOST_MP_DETAIL_BITSCAN_HPP #define BOOST_MP_DETAIL_BITSCAN_HPP -#if defined(BOOST_MSVC) && (defined(_M_IX86) || defined(_M_X64)) -#include +#if (defined(BOOST_MSVC) || (defined(__clang__) && defined(__c2__)) || (defined(BOOST_INTEL) && defined(_MSC_VER))) && (defined(_M_IX86) || defined(_M_X64)) +#include #endif namespace boost{ namespace multiprecision{ namespace detail{ @@ -38,7 +38,7 @@ inline unsigned find_msb(Unsigned mask, const mpl::int_<0>&) return --index; } -#if defined(BOOST_MSVC) && (defined(_M_IX86) || defined(_M_X64)) +#if (defined(BOOST_MSVC) || (defined(__clang__) && defined(__c2__)) || (defined(BOOST_INTEL) && defined(_MSC_VER))) && (defined(_M_IX86) || defined(_M_X64)) #pragma intrinsic(_BitScanForward,_BitScanReverse)