Merged trunk fixed to release branch for Boost 1.36

[SVN r47000]
This commit is contained in:
Ion Gaztañaga
2008-07-02 19:50:05 +00:00
parent 9286143ca4
commit 12152588b4
2 changed files with 2 additions and 2 deletions

View File

@@ -506,7 +506,7 @@ inline std::size_t floor_log2 (std::size_t x)
for(std::size_t shift = Bits >> 1; shift; shift >>= 1){
std::size_t tmp = n >> shift;
if (tmp)
log2 += shift, n = tmp;
log2 += shift, n = tmp;
}
return log2;

View File

@@ -1653,7 +1653,7 @@ class slist_impl
private:
void priv_splice_after(node_ptr prev_pos_n, slist_impl &x, node_ptr before_first_n, node_ptr before_last_n)
{
if (before_first_n != before_last_n && prev_pos_n != before_first_n && prev_pos_n != before_last_n)
if (before_first_n != before_last_n && prev_pos_n != before_first_n && prev_pos_n != before_last_n)
{
if(cache_last){
if(node_traits::get_next(prev_pos_n) == this->get_end_node()){