Updated Boost libraries to version 1.49, and recompiled them with NDK r8d
This commit is contained in:
@@ -54,7 +54,7 @@ class dynamic_bitset
|
||||
// of VC++ are likely able to digest a more drinking form of the
|
||||
// code; but changing it now is probably not worth the risks...]
|
||||
|
||||
BOOST_STATIC_ASSERT(detail::dynamic_bitset_impl::allowed_block_type<Block>::value);
|
||||
BOOST_STATIC_ASSERT((bool)detail::dynamic_bitset_impl::allowed_block_type<Block>::value);
|
||||
|
||||
public:
|
||||
typedef Block block_type;
|
||||
@@ -670,7 +670,7 @@ resize(size_type num_bits, bool value) // strong guarantee
|
||||
|
||||
if (value && (num_bits > m_num_bits)) {
|
||||
|
||||
const size_type extra_bits = count_extra_bits();
|
||||
const block_width_type extra_bits = count_extra_bits();
|
||||
if (extra_bits) {
|
||||
assert(old_num_blocks >= 1 && old_num_blocks <= m_bits.size());
|
||||
|
||||
@@ -1108,10 +1108,10 @@ to_ulong() const
|
||||
// beyond the "allowed" positions
|
||||
typedef unsigned long result_type;
|
||||
|
||||
const size_type max_size =
|
||||
const size_type maximum_size =
|
||||
(std::min)(m_num_bits, static_cast<size_type>(ulong_width));
|
||||
|
||||
const size_type last_block = block_index( max_size - 1 );
|
||||
const size_type last_block = block_index( maximum_size - 1 );
|
||||
|
||||
assert((last_block * bits_per_block) < static_cast<size_type>(ulong_width));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user