From ad3603ef5ce045dd25fc3130f75218a438bf4e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Mon, 16 Sep 2013 16:59:29 +0000 Subject: [PATCH] Last merge for 1.55 (Intrusive) [SVN r85703] --- include/boost/intrusive/detail/utilities.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/boost/intrusive/detail/utilities.hpp b/include/boost/intrusive/detail/utilities.hpp index 5e6abdb..ab7b02c 100644 --- a/include/boost/intrusive/detail/utilities.hpp +++ b/include/boost/intrusive/detail/utilities.hpp @@ -429,6 +429,8 @@ struct sqrt2_pow_max >::t static const std::size_t pow = 31; }; +#ifndef BOOST_NO_INT64_T + template struct sqrt2_pow_max >::type> { @@ -436,6 +438,8 @@ struct sqrt2_pow_max >::t static const std::size_t pow = 63; }; +#endif //BOOST_NO_INT64_T + // Returns floor(pow(sqrt(2), x * 2 + 1)). // Defined for X from 0 up to the number of bits in size_t minus 1. inline std::size_t sqrt2_pow_2xplus1 (std::size_t x)