diff --git a/sprout/iterator/distance.hpp b/sprout/iterator/distance.hpp index 70383652..d95ece35 100644 --- a/sprout/iterator/distance.hpp +++ b/sprout/iterator/distance.hpp @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -91,7 +92,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_constant_distance_iterator::value && sprout::is_input_iterator::value - && std::is_literal_type::value, + && sprout::is_literal_type::value, typename std::iterator_traits::difference_type >::type iterator_distance_dispatch(InputIterator first, InputIterator last) { @@ -101,7 +102,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< !sprout::is_constant_distance_iterator::value && sprout::is_input_iterator::value - && !std::is_literal_type::value, + && !sprout::is_literal_type::value, typename std::iterator_traits::difference_type >::type iterator_distance_dispatch(InputIterator first, InputIterator last) { diff --git a/sprout/iterator/next.hpp b/sprout/iterator/next.hpp index 676f2733..ef57879f 100644 --- a/sprout/iterator/next.hpp +++ b/sprout/iterator/next.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -100,7 +101,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< - std::is_literal_type::value, + sprout::is_literal_type::value, InputIterator >::type next_impl( @@ -113,7 +114,7 @@ namespace sprout { } template inline SPROUT_CONSTEXPR typename std::enable_if< - !std::is_literal_type::value, + !sprout::is_literal_type::value, InputIterator >::type next_impl( diff --git a/sprout/iterator/prev.hpp b/sprout/iterator/prev.hpp index 414b7457..42fc1ee3 100644 --- a/sprout/iterator/prev.hpp +++ b/sprout/iterator/prev.hpp @@ -14,6 +14,7 @@ #include #include #include +#include #include namespace sprout_adl { @@ -73,7 +74,7 @@ namespace sprout { template inline SPROUT_CONSTEXPR typename std::enable_if< - std::is_literal_type::value, + sprout::is_literal_type::value, BidirectionalIterator >::type prev_impl( @@ -88,7 +89,7 @@ namespace sprout { } template inline SPROUT_CONSTEXPR typename std::enable_if< - !std::is_literal_type::value, + !sprout::is_literal_type::value, BidirectionalIterator >::type prev_impl( diff --git a/sprout/math/issubnormal.hpp b/sprout/math/issubnormal.hpp index 9b9c7a2d..badea999 100644 --- a/sprout/math/issubnormal.hpp +++ b/sprout/math/issubnormal.hpp @@ -41,7 +41,7 @@ namespace sprout { typename sprout::enabler_if::value>::type = sprout::enabler > inline SPROUT_CONSTEXPR bool - issubnormal(FloatType x) { + issubnormal SPROUT_PREVENT_MACRO_SUBSTITUTION (FloatType x) { return !sprout::math::isnan(x) && !sprout::math::iszero(x) && sprout::math::detail::issubnormal_or_zero(x)