Last merge for 1.55 (Intrusive)

[SVN r85703]
This commit is contained in:
Ion Gaztañaga
2013-09-16 16:59:29 +00:00
parent 60dcfbe157
commit ad3603ef5c

View File

@@ -429,6 +429,8 @@ struct sqrt2_pow_max<SizeType, typename enable_if< numbits_eq<SizeType, 32> >::t
static const std::size_t pow = 31;
};
#ifndef BOOST_NO_INT64_T
template <class SizeType>
struct sqrt2_pow_max<SizeType, typename enable_if< numbits_eq<SizeType, 64> >::type>
{
@@ -436,6 +438,8 @@ struct sqrt2_pow_max<SizeType, typename enable_if< numbits_eq<SizeType, 64> >::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)