Fixed minor gcc warnings

[libcds.git] / cds / intrusive / details / michael_set_base.h

diff --git a/cds/intrusive/details/michael_set_base.h b/cds/intrusive/details/michael_set_base.h
index 8348369f1d7046654271572f437f99b924182545..aa135fdf5d3f7824b95a8a9f7f57aad6d50d4313 100644 (file)
--- a/cds/intrusive/details/michael_set_base.h
+++ b/cds/intrusive/details/michael_set_base.h
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,7 +25,7 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #ifndef CDSLIB_INTRUSIVE_DETAILS_MICHAEL_SET_BASE_H
@@ -94,10 +94,10 @@ namespace cds { namespace intrusive {
                     nLoadFactor = 1;
                 if ( nMaxItemCount == 0 )
                     nMaxItemCount = 4;
-                const size_t nBucketCount = (size_t)( nMaxItemCount / nLoadFactor );
-                const size_t nLog2 = cds::bitop::MSB( nBucketCount );
+                const size_t nBucketCount = nMaxItemCount / nLoadFactor;
+                const size_t exp2 = size_t( 1 ) << cds::bitop::MSB( nBucketCount );
 
-                return (( size_t( 1 << nLog2 ) < nBucketCount ? size_t( 1 << (nLog2 + 1) ) : size_t( 1 << nLog2 ))) - 1;
+                return ( exp2 < nBucketCount ? exp2 * 2 : exp2 ) - 1;
             }
 
             template <typename OrderedList, bool IsConst>
@@ -120,7 +120,8 @@ namespace cds { namespace intrusive {
             template <typename OrderedList, bool IsConst>
             class iterator
             {
-                friend class iterator < OrderedList, !IsConst >;
+                friend class iterator< OrderedList, !IsConst >;
+
             protected:
                 typedef OrderedList bucket_type;
                 typedef typename list_iterator_selector< bucket_type, IsConst>::bucket_ptr bucket_ptr;