From 02ce5096eeeb749e62fb956ba26a2036b574fabf Mon Sep 17 00:00:00 2001 From: khizmax Date: Tue, 5 Apr 2016 21:21:19 +0300 Subject: [PATCH] Fixed VC++ 14.2 warnings --- cds/algo/int_algo.h | 2 +- cds/intrusive/details/michael_set_base.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cds/algo/int_algo.h b/cds/algo/int_algo.h index a070ad33..b3509369 100644 --- a/cds/algo/int_algo.h +++ b/cds/algo/int_algo.h @@ -45,7 +45,7 @@ namespace cds { namespace beans { static inline size_t log2ceil( size_t n ) { size_t i = log2floor( n ); - return size_t( 1 << i ) < n ? i + 1 : i; + return ( size_t( 1 ) << i ) < n ? i + 1 : i; } /// Returns largest previous power of 2 for \p n diff --git a/cds/intrusive/details/michael_set_base.h b/cds/intrusive/details/michael_set_base.h index 8348369f..2e7eef9b 100644 --- a/cds/intrusive/details/michael_set_base.h +++ b/cds/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 -- 2.34.1