projects
/
libcds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed -Wshadow warnings
[libcds.git]
/
cds
/
container
/
michael_map_nogc.h
diff --git
a/cds/container/michael_map_nogc.h
b/cds/container/michael_map_nogc.h
index 7d3c2e847f93ddb95f0772bcf563cc59a1a94c9f..610eef33901a96f15683d7c8f86f2db061c543fa 100644
(file)
--- a/
cds/container/michael_map_nogc.h
+++ b/
cds/container/michael_map_nogc.h
@@
-79,10
+79,6
@@
namespace cds { namespace container {
// GC and OrderedList::gc must be the same
static_assert(std::is_same<gc, typename ordered_list::gc>::value, "GC and OrderedList::gc must be the same");
// GC and OrderedList::gc must be the same
static_assert(std::is_same<gc, typename ordered_list::gc>::value, "GC and OrderedList::gc must be the same");
- // atomicity::empty_item_counter is not allowed as a item counter
- static_assert(!std::is_same<item_counter, atomicity::empty_item_counter>::value,
- "cds::atomicity::empty_item_counter is not allowed as a item counter");
-
protected:
//@cond
typedef typename ordered_list::template select_stat_wrapper< typename ordered_list::stat > bucket_stat;
protected:
//@cond
typedef typename ordered_list::template select_stat_wrapper< typename ordered_list::stat > bucket_stat;
@@
-107,10
+103,10
@@
namespace cds { namespace container {
protected:
//@cond
const size_t m_nHashBitmask;
protected:
//@cond
const size_t m_nHashBitmask;
- item_counter m_ItemCounter; ///< Item counter
- hash m_HashFunctor; ///< Hash functor
+ hash m_HashFunctor; ///< Hash functor
internal_bucket_type* m_Buckets; ///< bucket table
internal_bucket_type* m_Buckets; ///< bucket table
- stat m_Stat; ///< Internal statistics
+ item_counter m_ItemCounter; ///< Item counter
+ stat m_Stat; ///< Internal statistics
//@endcond
protected:
//@endcond
protected:
@@
-530,8
+526,8
@@
namespace cds { namespace container {
/// Checks whether the map is empty
/**
/// Checks whether the map is empty
/**
- Emptiness is checked by item counting: if item count is zero then the map is empty.
-
Thus, the correct item counting feature is an important part of Michael's map implementation
.
+ @warning If you use \p atomicity::empty_item_counter in \p traits::item_counter,
+
the function always returns \p true
.
*/
bool empty() const
{
*/
bool empty() const
{
@@
-539,6
+535,10
@@
namespace cds { namespace container {
}
/// Returns item count in the map
}
/// Returns item count in the map
+ /**
+ If you use \p atomicity::empty_item_counter in \p traits::item_counter,
+ the function always returns 0.
+ */
size_t size() const
{
return m_ItemCounter;
size_t size() const
{
return m_ItemCounter;
@@
-590,15
+590,15
@@
namespace cds { namespace container {
}
template <typename Stat>
}
template <typename Stat>
- typename std::enable_if< Stat::empty >::type construct_bucket( internal_bucket_type* b
ucket
)
+ typename std::enable_if< Stat::empty >::type construct_bucket( internal_bucket_type* b )
{
{
- new (b
ucket
) internal_bucket_type;
+ new (b) internal_bucket_type;
}
template <typename Stat>
}
template <typename Stat>
- typename std::enable_if< !Stat::empty >::type construct_bucket( internal_bucket_type* b
ucket
)
+ typename std::enable_if< !Stat::empty >::type construct_bucket( internal_bucket_type* b )
{
{
- new (b
ucket
) internal_bucket_type( m_Stat );
+ new (b) internal_bucket_type( m_Stat );
}
//@endcond
};
}
//@endcond
};