From e1204bcd890e14ee33cb22931e914e88382a5133 Mon Sep 17 00:00:00 2001 From: khizmax Date: Wed, 18 Jan 2017 11:24:30 +0300 Subject: [PATCH] docfix --- cds/container/impl/feldman_hashset.h | 4 ++-- cds/intrusive/cuckoo_set.h | 4 ++-- test/include/cds_test/stat_ellenbintree_out.h | 4 ++-- test/unit/queue/fcqueue.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cds/container/impl/feldman_hashset.h b/cds/container/impl/feldman_hashset.h index 51d05706..0d17f6eb 100644 --- a/cds/container/impl/feldman_hashset.h +++ b/cds/container/impl/feldman_hashset.h @@ -287,8 +287,8 @@ namespace cds { namespace container { public: /// Creates empty set /** - @param head_bits: 2head_bits specifies the size of head array, minimum is 4. - @param array_bits: 2array_bits specifies the size of array node, minimum is 2. + @param head_bits - 2head_bits specifies the size of head array, minimum is 4. + @param array_bits - 2array_bits specifies the size of array node, minimum is 2. Equation for \p head_bits and \p array_bits: \code diff --git a/cds/intrusive/cuckoo_set.h b/cds/intrusive/cuckoo_set.h index 3ba7c81c..dffba6e7 100644 --- a/cds/intrusive/cuckoo_set.h +++ b/cds/intrusive/cuckoo_set.h @@ -2736,7 +2736,7 @@ namespace cds { namespace intrusive { /// Clears the set /** The function unlinks all items from the set. - For any item @ref disposer is called + For any item @ref disposer is called */ void clear() { @@ -2753,7 +2753,7 @@ namespace cds { namespace intrusive { }; \endcode - The @ref disposer specified in \p Traits is not called. + The @ref disposer specified in \p Traits is not called. */ template void clear_and_dispose( Disposer oDisposer ) diff --git a/test/include/cds_test/stat_ellenbintree_out.h b/test/include/cds_test/stat_ellenbintree_out.h index ce79f5f6..fafbee85 100644 --- a/test/include/cds_test/stat_ellenbintree_out.h +++ b/test/include/cds_test/stat_ellenbintree_out.h @@ -44,8 +44,8 @@ namespace cds_test { static inline property_stream& operator <<( property_stream& o, cds::intrusive::ellen_bintree::stat<> const& s ) { return o - //<< "\t\t Internal node allocated: " << ellen_bintree_pool::internal_node_counter::m_nAlloc.get() << "\n" - //<< "\t\t Internal node freed: " << ellen_bintree_pool::internal_node_counter::m_nFree.get() << "\n" + // << "\t\t Internal node allocated: " << ellen_bintree_pool::internal_node_counter::m_nAlloc.get() << "\n" + // << "\t\t Internal node freed: " << ellen_bintree_pool::internal_node_counter::m_nFree.get() << "\n" << CDSSTRESS_STAT_OUT( s, m_nInternalNodeCreated ) << CDSSTRESS_STAT_OUT( s, m_nInternalNodeDeleted ) << CDSSTRESS_STAT_OUT( s, m_nUpdateDescCreated ) diff --git a/test/unit/queue/fcqueue.cpp b/test/unit/queue/fcqueue.cpp index f6fccd0b..bbf9c95c 100644 --- a/test/unit/queue/fcqueue.cpp +++ b/test/unit/queue/fcqueue.cpp @@ -53,7 +53,7 @@ namespace { // enqueue/dequeue for ( int i = 0; i < nSize; ++i ) { ASSERT_TRUE( q.enqueue( value_type(i))); - ASSERT_EQ( q.size(), i + 1 ); + ASSERT_EQ( q.size(), static_cast(i + 1)); } ASSERT_FALSE( q.empty()); ASSERT_EQ( q.size(), nSize ); -- 2.34.1