Merge branch 'ldionne-ldionne-cmake' into dev

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

diff --git a/cds/intrusive/details/skip_list_base.h b/cds/intrusive/details/skip_list_base.h
index c902c770f5a473bf82043e88a4d106e624eaf732..89371d539a41c3e69fe5bbec461c58d8c8daa217 100644 (file)
--- a/cds/intrusive/details/skip_list_base.h
+++ b/cds/intrusive/details/skip_list_base.h
@@ -276,7 +276,7 @@ namespace cds { namespace intrusive {
                 \p c_nUpperBound must be no more than 32.
             - <tt>random_generator()</tt> - the constructor of generator object initialises the generator instance (its internal state).
             - <tt>unsigned int operator()()</tt> - the main generating function. Returns random level from range <tt>[0 .. c_nUpperBound - 1]</tt>
-               
+
 
             Stateful generators are supported.
 
@@ -613,7 +613,7 @@ namespace cds { namespace intrusive {
             /**
                 The type for item counting feature.
                 By default, item counting is disabled (\p atomicity::empty_item_counter),
-                \p atomicity::item_counter enables it.
+                \p atomicity::item_counter or \p atomicity::cache_friendly_item_counter enables it.
             */
             typedef atomicity::empty_item_counter     item_counter;
 
@@ -680,11 +680,11 @@ namespace cds { namespace intrusive {
             - \p opt::disposer - the functor used for dispose removed items. Default is \p opt::v::empty_disposer. Due the nature
                 of GC schema the disposer may be called asynchronously.
             - \p opt::item_counter - the type of item counting feature. Default is disabled, i.e. \p atomicity::empty_item_counter.
-                To enable it use \p atomicity::item_counter
+                To enable it use \p atomicity::item_counter or \p atomicity::cache_friendly_item_counter
             - \p opt::memory_model - C++ memory ordering model. Can be \p opt::v::relaxed_ordering (relaxed memory model, the default)
                 or \p opt::v::sequential_consistent (sequentially consisnent memory model).
             - \p skip_list::random_level_generator - random level generator. Can be \p skip_list::xor_shift,
-                \p skip_list::turbo32 (the default) or user-provided one. 
+                \p skip_list::turbo32 (the default) or user-provided one.
                 See \p skip_list::random_level_generator option description for explanation.
             - \p opt::allocator - although the skip-list is an intrusive container,
                 an allocator should be provided to maintain variable randomly-calculated height of the node