From 12152588b4d4832aedcbed1f6271db21bbe3ebb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Wed, 2 Jul 2008 19:50:05 +0000 Subject: [PATCH] Merged trunk fixed to release branch for Boost 1.36 [SVN r47000] --- include/boost/intrusive/detail/utilities.hpp | 2 +- include/boost/intrusive/slist.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/intrusive/detail/utilities.hpp b/include/boost/intrusive/detail/utilities.hpp index 743f329..7a92449 100644 --- a/include/boost/intrusive/detail/utilities.hpp +++ b/include/boost/intrusive/detail/utilities.hpp @@ -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; diff --git a/include/boost/intrusive/slist.hpp b/include/boost/intrusive/slist.hpp index 14c614f..bab8308 100644 --- a/include/boost/intrusive/slist.hpp +++ b/include/boost/intrusive/slist.hpp @@ -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()){