projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9a5c7c0
)
docfix
author
khizmax
<khizmax@gmail.com>
Wed, 18 Jan 2017 08:24:30 +0000
(11:24 +0300)
committer
khizmax
<khizmax@gmail.com>
Wed, 18 Jan 2017 08:24:30 +0000
(11:24 +0300)
cds/container/impl/feldman_hashset.h
patch
|
blob
|
history
cds/intrusive/cuckoo_set.h
patch
|
blob
|
history
test/include/cds_test/stat_ellenbintree_out.h
patch
|
blob
|
history
test/unit/queue/fcqueue.cpp
patch
|
blob
|
history
diff --git
a/cds/container/impl/feldman_hashset.h
b/cds/container/impl/feldman_hashset.h
index 51d0570682e538f112eca0ffffa7043fb3cbbf53..0d17f6ebb10b55ee8d98715f7880fb2547d46055 100644
(file)
--- 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
/**
public:
/// Creates empty set
/**
- @param head_bits
:
2<sup>head_bits</sup> specifies the size of head array, minimum is 4.
- @param array_bits
:
2<sup>array_bits</sup> specifies the size of array node, minimum is 2.
+ @param head_bits
-
2<sup>head_bits</sup> specifies the size of head array, minimum is 4.
+ @param array_bits
-
2<sup>array_bits</sup> specifies the size of array node, minimum is 2.
Equation for \p head_bits and \p array_bits:
\code
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 3ba7c81c1952f62170bf0f430e67267f8797efca..dffba6e7ec126b03cb1726f36c5bcb606474297a 100644
(file)
--- 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.
/// Clears the set
/**
The function unlinks all items from the set.
- For any item <tt> @ref disposer</tt> is called
+ For any item <tt> @ref disposer
</tt> is called
*/
void clear()
{
*/
void clear()
{
@@
-2753,7
+2753,7
@@
namespace cds { namespace intrusive {
};
\endcode
};
\endcode
- The <tt> @ref disposer</tt> specified in \p Traits is not called.
+ The <tt> @ref disposer
</tt> specified in \p Traits is not called.
*/
template <typename Disposer>
void clear_and_dispose( Disposer oDisposer )
*/
template <typename Disposer>
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 ce79f5f6679053e624f90056df64e35920400b22..fafbee85fad74a148e9c18cc519bf7129ca98280 100644
(file)
--- 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
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 )
<< 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 f6fccd0be1fe44974f9d99952bef920525582d4d..bbf9c95c122b8f37cef7949ef7a5641c319f57af 100644
(file)
--- 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)));
// 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<size_t>(i + 1)
);
}
ASSERT_FALSE( q.empty());
ASSERT_EQ( q.size(), nSize );
}
ASSERT_FALSE( q.empty());
ASSERT_EQ( q.size(), nSize );