projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47aca82
)
Fixed ambiguous ceil2() call in 32bit target
author
khizmax
<libcds.dev@gmail.com>
Tue, 30 May 2017 19:13:08 +0000
(22:13 +0300)
committer
khizmax
<libcds.dev@gmail.com>
Tue, 30 May 2017 19:13:08 +0000
(22:13 +0300)
cds/algo/flat_combining/kernel.h
patch
|
blob
|
history
diff --git
a/cds/algo/flat_combining/kernel.h
b/cds/algo/flat_combining/kernel.h
index 202293b4f19a14f270be6abfa5388ec8d776e480..ea051693792a833831ad7f7ec6cf974aeadd7b15 100644
(file)
--- a/
cds/algo/flat_combining/kernel.h
+++ b/
cds/algo/flat_combining/kernel.h
@@
-284,7
+284,7
@@
namespace cds { namespace algo {
, m_pHead( nullptr )
, m_pAllocatedHead( nullptr )
, m_pThreadRec( tls_cleanup )
- , m_nCompactFactor(
(unsigned int)( cds::beans::ceil2( nCompactFactor
) - 1 )) // binary mask
+ , m_nCompactFactor(
static_cast<unsigned>( cds::beans::ceil2( static_cast<size_t>( nCompactFactor )
) - 1 )) // binary mask
, m_nCombinePassCount( nCombinePassCount )
{
assert( m_pThreadRec.get() == nullptr );