From: khizmax Date: Sat, 29 Nov 2014 11:57:34 +0000 (+0300) Subject: Removing trailing spaces X-Git-Tag: v2.0.0~36 X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=1831737c7cc9d4b31ee6f555f8450fba0748571d Removing trailing spaces --- diff --git a/cds/container/cuckoo_map.h b/cds/container/cuckoo_map.h index 826b1bb5..2ab66449 100644 --- a/cds/container/cuckoo_map.h +++ b/cds/container/cuckoo_map.h @@ -140,7 +140,7 @@ namespace cds { namespace container { - \p Key - key type - \p T - the type stored in the map. - \p Traits - map traits., default is \p cuckoo::traits. - It is possible to declare option-based set with \p cuckoo::make_traits metafunction + It is possible to declare option-based set with \p cuckoo::make_traits metafunction result as \p Traits template argument. Examples diff --git a/cds/container/details/ellen_bintree_base.h b/cds/container/details/ellen_bintree_base.h index 1439b823..7a15e359 100644 --- a/cds/container/details/ellen_bintree_base.h +++ b/cds/container/details/ellen_bintree_base.h @@ -192,7 +192,7 @@ namespace cds { namespace container { /// Key copy policy (for \p EllenBinTreeMap) /** The key copy policy defines a functor to copy leaf node's key to internal node. - This policy is used only in \p EllenBinTreeMap. + This policy is used only in \p EllenBinTreeMap. By default, assignment operator is used. The copy functor interface is: @@ -238,7 +238,7 @@ namespace cds { namespace container { - \p opt::stat - internal statistics, by default disabled (\p ellen_bintree::empty_stat). To enable it use \p ellen_bintree::stat. - \p opt::backoff - back-off strategy, by default no strategy is used (\p cds::backoff::empty) - - \p opt::rcu_check_deadlock - a deadlock checking policy, only for RCU-based tree. + - \p opt::rcu_check_deadlock - a deadlock checking policy, only for RCU-based tree. Default is \p opt::v::rcu_throw_deadlock. */ template diff --git a/cds/container/details/skip_list_base.h b/cds/container/details/skip_list_base.h index 58e37a03..ab59d10c 100644 --- a/cds/container/details/skip_list_base.h +++ b/cds/container/details/skip_list_base.h @@ -25,7 +25,7 @@ namespace cds { namespace container { /// Skip list internal statistics template - using stat = cds::intrusive::skip_list::stat < EventCounter > ; + using stat = cds::intrusive::skip_list::stat < EventCounter >; /// Skip list empty internal statistics typedef cds::intrusive::skip_list::empty_stat empty_stat; @@ -105,7 +105,7 @@ namespace cds { namespace container { - \p opt::allocator - allocator for skip-list node. Default is \ref CDS_DEFAULT_ALLOCATOR. - \p opt::back_off - back-off strategy used. If the option is not specified, the \p cds::backoff::Default is used. - \p opt::stat - internal statistics. Available types: \p skip_list::stat, \p skip_list::empty_stat (the default) - - \p opt::rcu_check_deadlock - a deadlock checking policy for RCU-based skip-list. + - \p opt::rcu_check_deadlock - a deadlock checking policy for RCU-based skip-list. Default is \p opt::v::rcu_throw_deadlock */ diff --git a/cds/container/ellen_bintree_set_rcu.h b/cds/container/ellen_bintree_set_rcu.h index 724daf77..a0f79b13 100644 --- a/cds/container/ellen_bintree_set_rcu.h +++ b/cds/container/ellen_bintree_set_rcu.h @@ -147,7 +147,7 @@ namespace cds { namespace container { /// pointer to extracted node using exempt_ptr = cds::urcu::exempt_ptr < gc, leaf_node, value_type, typename maker::intrusive_traits::disposer, cds::urcu::details::conventional_exempt_member_cast < leaf_node, value_type > - > ; + >; public: /// Default constructor @@ -196,7 +196,7 @@ namespace cds { namespace container { \endcode where \p val is the item inserted. User-defined functor \p f should guarantee that during changing \p val no any other changes could be made on this set's item by concurrent threads. - The user-defined functor is called only if the inserting is success. + The user-defined functor is called only if the inserting is success. RCU \p synchronize() can be called. RCU should not be locked. */ diff --git a/cds/container/impl/ellen_bintree_map.h b/cds/container/impl/ellen_bintree_map.h index 1d78da4b..3cd74182 100644 --- a/cds/container/impl/ellen_bintree_map.h +++ b/cds/container/impl/ellen_bintree_map.h @@ -80,7 +80,7 @@ namespace cds { namespace container { typedef Key key_type; ///< type of a key stored in the map typedef T mapped_type; ///< type of value stored in the map typedef std::pair< key_type const, mapped_type > value_type ; ///< Key-value pair stored in leaf node of the mp - typedef Traits traits; ///< Map traits + typedef Traits traits; ///< Map traits # ifdef CDS_DOXYGEN_INVOKED typedef implementation_defined key_comparator; ///< key compare functor based on \p Traits::compare and \p Traits::less diff --git a/cds/container/impl/skip_list_map.h b/cds/container/impl/skip_list_map.h index 9d0bb2ac..3eb13f8b 100644 --- a/cds/container/impl/skip_list_map.h +++ b/cds/container/impl/skip_list_map.h @@ -36,7 +36,7 @@ namespace cds { namespace container { - \p K - type of a key to be stored in the list. - \p T - type of a value to be stored in the list. - \p Traits - map traits, default is \p skip_list::traits - It is possible to declare option-based list with \p cds::container::skip_list::make_traits metafunction + It is possible to declare option-based list with \p cds::container::skip_list::make_traits metafunction istead of \p Traits template argument. Like STL map class, \p %SkipListMap stores the key-value pair as std:pair< K const, T>. diff --git a/cds/container/impl/skip_list_set.h b/cds/container/impl/skip_list_set.h index 3f424544..18bcf09d 100644 --- a/cds/container/impl/skip_list_set.h +++ b/cds/container/impl/skip_list_set.h @@ -36,7 +36,7 @@ namespace cds { namespace container { - \p GC - Garbage collector used. - \p T - type to be stored in the list. - \p Traits - set traits, default is \p skip_list::traits. - It is possible to declare option-based list with \p cds::container::skip_list::make_traits metafunction + It is possible to declare option-based list with \p cds::container::skip_list::make_traits metafunction istead of \p Traits template argument. @warning The skip-list requires up to 67 hazard pointers that may be critical for some GCs for which diff --git a/cds/container/skip_list_map_nogc.h b/cds/container/skip_list_map_nogc.h index 7745b7ea..a14890dc 100644 --- a/cds/container/skip_list_map_nogc.h +++ b/cds/container/skip_list_map_nogc.h @@ -31,7 +31,7 @@ namespace cds { namespace container { - \p K - type of a key to be stored in the map. - \p T - type of a value to be stored in the map. - \p Traits - map traits, default is \p skip_list::traits - It is possible to declare option-based list with \p cds::container::skip_list::make_traits + It is possible to declare option-based list with \p cds::container::skip_list::make_traits metafunction istead of \p Traits template argument. */ template < diff --git a/cds/container/skip_list_map_rcu.h b/cds/container/skip_list_map_rcu.h index e47917c3..49245d7e 100644 --- a/cds/container/skip_list_map_rcu.h +++ b/cds/container/skip_list_map_rcu.h @@ -444,7 +444,7 @@ namespace cds { namespace container { /// Extracts an item with minimal key from the map /** - The function searches an item with minimal key, unlinks it, + The function searches an item with minimal key, unlinks it, and returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the item. If the skip-list is empty the function returns an empty \p exempt_ptr. @@ -461,7 +461,7 @@ namespace cds { namespace container { /// Extracts an item with maximal key from the map /** - The function searches an item with maximal key, unlinks it from the set, + The function searches an item with maximal key, unlinks it from the set, and returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the item. If the skip-list is empty the function returns an empty \p exempt_ptr. diff --git a/cds/container/skip_list_set_rcu.h b/cds/container/skip_list_set_rcu.h index a61ce17a..50048335 100644 --- a/cds/container/skip_list_set_rcu.h +++ b/cds/container/skip_list_set_rcu.h @@ -477,7 +477,7 @@ namespace cds { namespace container { /// Extracts an item with minimal key from the set /** - The function searches an item with minimal key, unlinks it, + The function searches an item with minimal key, unlinks it, and returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the item. If the skip-list is empty the function returns an empty \p exempt_ptr. @@ -494,7 +494,7 @@ namespace cds { namespace container { /// Extracts an item with maximal key from the set /** - The function searches an item with maximal key, unlinks it from the set, + The function searches an item with maximal key, unlinks it from the set, and returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the item. If the skip-list is empty the function returns an empty \p exempt_ptr. diff --git a/cds/container/striped_map.h b/cds/container/striped_map.h index 8969d5be..78022b61 100644 --- a/cds/container/striped_map.h +++ b/cds/container/striped_map.h @@ -77,7 +77,7 @@ namespace cds { namespace container { If the option is not specified, the \p %opt::less is used. - \p opt::less - specifies binary predicate used for key comparison. Default is \p std::less. - \p opt::item_counter - item counter type. Default is \p atomicity::item_counter since some operation on the counter is performed - without locks. Note that item counting is an essential part of the map algorithm, so dummy counter + without locks. Note that item counting is an essential part of the map algorithm, so dummy counter like as \p atomicity::empty_item_counter is not suitable. - \p opt::allocator - the allocator type using for memory allocation of bucket table and lock array. Default is \ref CDS_DEFAULT_ALLOCATOR. - \p opt::resizing_policy - the resizing policy that is a functor that decides when to resize the hash map. diff --git a/cds/container/striped_set.h b/cds/container/striped_set.h index 1eae6b91..1f142f0c 100644 --- a/cds/container/striped_set.h +++ b/cds/container/striped_set.h @@ -36,13 +36,13 @@ namespace cds { namespace container { - \p opt::mutex_policy - concurrent access policy. Available policies: \p intrusive::striped_set::striping, \p intrusive::striped_set::refinable. Default is \p %striped_set::striping. - - \p opt::hash - hash functor. Default option value see opt::v::hash_selector + - \p opt::hash - hash functor. Default option value see opt::v::hash_selector which selects default hash functor for your compiler. - \p opt::compare - key comparison functor. No default functor is provided. If the option is not specified, the \p %opt::less is used. - \p opt::less - specifies binary predicate used for key comparison. Default is \p std::less. - \p opt::item_counter - item counter type. Default is \p atomicity::item_counter since some operation on the counter is performed - without locks. Note that item counting is an essential part of the set algorithm, so dummy counter + without locks. Note that item counting is an essential part of the set algorithm, so dummy counter like as \p atomicity::empty_item_counter is not suitable. - \p opt::allocator - the allocator type using for memory allocation of bucket table and lock array. Default is \ref CDS_DEFAULT_ALLOCATOR. - \p opt::resizing_policy - the resizing policy that is a functor that decides when to resize the hash set. diff --git a/cds/gc/details/hp.h b/cds/gc/details/hp.h index 5685f0d0..c58192d9 100644 --- a/cds/gc/details/hp.h +++ b/cds/gc/details/hp.h @@ -92,14 +92,14 @@ namespace cds { The capacity is constant for any thread. It is defined by cds::gc::hp::GarbageCollector. */ size_t capacity() const CDS_NOEXCEPT - { - return m_arr.capacity(); + { + return m_arr.capacity(); } /// Current vector size (count of retired pointers in the vector) size_t size() const CDS_NOEXCEPT - { - return m_nSize; + { + return m_nSize; } /// Set vector size. Uses internally @@ -125,14 +125,14 @@ namespace cds { /// Begin iterator iterator begin() CDS_NOEXCEPT - { - return m_arr.begin(); + { + return m_arr.begin(); } /// End iterator iterator end() CDS_NOEXCEPT - { - return m_arr.begin() + m_nSize ; + { + return m_arr.begin() + m_nSize; } /// Clears the vector. After clearing, size() == 0 @@ -344,20 +344,20 @@ namespace cds { /// Returns max Hazard Pointer count defined in construction time size_t getHazardPointerCount() const CDS_NOEXCEPT - { - return m_nHazardPointerCount; + { + return m_nHazardPointerCount; } /// Returns max thread count defined in construction time size_t getMaxThreadCount() const CDS_NOEXCEPT - { - return m_nMaxThreadCount; + { + return m_nMaxThreadCount; } /// Returns max size of retired objects array. It is defined in construction time size_t getMaxRetiredPtrCount() const CDS_NOEXCEPT - { - return m_nMaxRetiredPtrCount; + { + return m_nMaxRetiredPtrCount; } // Internal statistics @@ -602,7 +602,7 @@ namespace cds { /// Auto hp_guard. /** This class encapsulates Hazard Pointer guard to protect a pointer against deletion . - It allocates one HP from thread's HP array in constructor and free the hazard pointer allocated + It allocates one HP from thread's HP array in constructor and free the hazard pointer allocated in destructor. */ class guard diff --git a/cds/gc/impl/dhp_decl.h b/cds/gc/impl/dhp_decl.h index 1cfb3f48..a3825f06 100644 --- a/cds/gc/impl/dhp_decl.h +++ b/cds/gc/impl/dhp_decl.h @@ -591,9 +591,9 @@ namespace cds { namespace gc { The function always returns \p true since the guard count is unlimited for \p gc::DHP garbage collector. */ - static CDS_CONSTEXPR bool check_available_guards( + static CDS_CONSTEXPR bool check_available_guards( #ifdef CDS_DOXYGEN_INVOKED - size_t nCountNeeded, + size_t nCountNeeded, #else size_t, #endif diff --git a/cds/gc/impl/hp_decl.h b/cds/gc/impl/hp_decl.h index e5790d7b..e47ff0cf 100644 --- a/cds/gc/impl/hp_decl.h +++ b/cds/gc/impl/hp_decl.h @@ -105,7 +105,7 @@ namespace cds { namespace gc { A guard is the hazard pointer. Additionally, the \p %Guard class manages allocation and deallocation of the hazard pointer - A \p %Guard object is not copy- and move-constructible + A \p %Guard object is not copy- and move-constructible and not copy- and move-assignable. */ class Guard : public hp::guard @@ -612,7 +612,7 @@ namespace cds { namespace gc { /// Checks if count of hazard pointer is no less than \p nCountNeeded /** - If \p bRaiseException is \p true (that is the default), the function raises + If \p bRaiseException is \p true (that is the default), the function raises an \p std::overflow_error exception "Too few hazard pointers" if \p nCountNeeded is more than the count of hazard pointer per thread. */ diff --git a/cds/intrusive/cuckoo_set.h b/cds/intrusive/cuckoo_set.h index e747ac37..c4be8d7a 100644 --- a/cds/intrusive/cuckoo_set.h +++ b/cds/intrusive/cuckoo_set.h @@ -1169,7 +1169,7 @@ namespace cds { namespace intrusive { /// Metafunction converting option list to \p CuckooSet traits /** Template argument list \p Options... are: - - \p intrusive::opt::hook - hook used. Possible values are: \p cuckoo::base_hook, \p cuckoo::member_hook, + - \p intrusive::opt::hook - hook used. Possible values are: \p cuckoo::base_hook, \p cuckoo::member_hook, \p cuckoo::traits_hook. If the option is not specified, %cuckoo::base_hook<> is used. - \p opt::hash - hash functor tuple, mandatory option. At least, two hash functors should be provided. All hash functor @@ -1658,7 +1658,7 @@ namespace cds { namespace intrusive { How to use You should incorporate \p cuckoo::node into your struct \p T and provide - appropriate \p cuckoo::traits::hook in your \p Traits template parameters. + appropriate \p cuckoo::traits::hook in your \p Traits template parameters. Usually, for \p Traits you define a struct based on \p cuckoo::traits. Example for base hook and list-based probe-set: diff --git a/cds/intrusive/details/skip_list_base.h b/cds/intrusive/details/skip_list_base.h index 4f2843cf..d4e6de15 100644 --- a/cds/intrusive/details/skip_list_base.h +++ b/cds/intrusive/details/skip_list_base.h @@ -25,7 +25,7 @@ namespace cds { namespace intrusive { - \p Tag - a \ref cds_intrusive_hook_tag "tag" */ template - class node + class node { public: typedef GC gc; ///< Garbage collector @@ -576,7 +576,7 @@ namespace cds { namespace intrusive { To enable it use \p atomicity::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::xorshift, + - \p skip_list::random_level_generator - random level generator. Can be \p skip_list::xorshift, \p skip_list::turbo_pascal (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, diff --git a/cds/intrusive/ellen_bintree_rcu.h b/cds/intrusive/ellen_bintree_rcu.h index 56553ae8..e1120c1a 100644 --- a/cds/intrusive/ellen_bintree_rcu.h +++ b/cds/intrusive/ellen_bintree_rcu.h @@ -205,7 +205,7 @@ namespace cds { namespace intrusive { // ... \endcode - Instead of declaring \p set_traits type traits we can use option-based syntax with + Instead of declaring \p set_traits type traits we can use option-based syntax with \p ellen_bintree::make_traits metafunction, for example: \code typedef cds::intrusive::EllenBinTree< gpb_rcu, std::string, Foo, @@ -967,7 +967,7 @@ namespace cds { namespace intrusive { /// Extracts an item with minimal key from the tree /** - The function searches an item with minimal key, unlinks it, and returns + The function searches an item with minimal key, unlinks it, and returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the leftmost item. If the tree is empty the function returns empty \p exempt_ptr. @@ -988,7 +988,7 @@ namespace cds { namespace intrusive { /// Extracts an item with maximal key from the tree /** - The function searches an item with maximal key, unlinks it, and returns + The function searches an item with maximal key, unlinks it, and returns \ref cds::urcu::exempt_ptr "exempt_ptr" pointer to the rightmost item. If the tree is empty the function returns empty \p exempt_ptr. diff --git a/cds/intrusive/impl/ellen_bintree.h b/cds/intrusive/impl/ellen_bintree.h index 22f375b0..bf10cf73 100644 --- a/cds/intrusive/impl/ellen_bintree.h +++ b/cds/intrusive/impl/ellen_bintree.h @@ -1382,7 +1382,7 @@ namespace cds { namespace intrusive { update_ptr updGP( res.updGrandParent.ptr() ); if ( res.pGrandParent->m_pUpdate.compare_exchange_strong( updGP, update_ptr( pOp, update_desc::DFlag ), - memory_model::memory_order_acquire, atomics::memory_order_relaxed ) ) + memory_model::memory_order_acquire, atomics::memory_order_relaxed ) ) { if ( help_delete( pOp ) ) break; diff --git a/cds/intrusive/impl/skip_list.h b/cds/intrusive/impl/skip_list.h index 7a5043d7..58169703 100644 --- a/cds/intrusive/impl/skip_list.h +++ b/cds/intrusive/impl/skip_list.h @@ -181,7 +181,7 @@ namespace cds { namespace intrusive { - \p T - type to be stored in the list. The type must be based on \p skip_list::node (for \p skip_list::base_hook) or it must have a member of type \p skip_list::node (for \p skip_list::member_hook). - \p Traits - skip-list traits, default is \p skip_list::traits. - It is possible to declare option-based list with \p cds::intrusive::skip_list::make_traits metafunction istead of \p Traits + It is possible to declare option-based list with \p cds::intrusive::skip_list::make_traits metafunction istead of \p Traits template argument. @warning The skip-list requires up to 67 hazard pointers that may be critical for some GCs for which @@ -1278,7 +1278,7 @@ namespace cds { namespace intrusive { /// Extracts an item with maximal key from the list /** - The function searches an item with maximal key, unlinks it, and returns the pointer to item + The function searches an item with maximal key, unlinks it, and returns the pointer to item as \p guarded_ptr object. If the skip-list is empty the function returns an empty \p guarded_ptr. diff --git a/cds/intrusive/lazy_list_rcu.h b/cds/intrusive/lazy_list_rcu.h index 81b5512e..b3e04997 100644 --- a/cds/intrusive/lazy_list_rcu.h +++ b/cds/intrusive/lazy_list_rcu.h @@ -231,7 +231,7 @@ namespace cds { namespace intrusive { public: /// pointer to extracted node - using exempt_ptr = cds::urcu::exempt_ptr< gc, value_type, value_type, clear_and_dispose, void >; + using exempt_ptr = cds::urcu::exempt_ptr< gc, value_type, value_type, clear_and_dispose, void >; protected: //@cond diff --git a/cds/intrusive/skip_list_nogc.h b/cds/intrusive/skip_list_nogc.h index 6f6abf4c..6ff153c2 100644 --- a/cds/intrusive/skip_list_nogc.h +++ b/cds/intrusive/skip_list_nogc.h @@ -213,7 +213,7 @@ namespace cds { namespace intrusive { - \p T - type to be stored in the set. The type must be based on \p skip_list::node (for \p skip_list::base_hook) or it must have a member of type \p skip_list::node (for \p skip_list::member_hook). - \p Traits - type traits, default is \p skip_list::traits. - It is possible to declare option-based list with \p cds::intrusive::skip_list::make_traits metafunction + It is possible to declare option-based list with \p cds::intrusive::skip_list::make_traits metafunction istead of \p Traits template argument. Iterators diff --git a/cds/intrusive/skip_list_rcu.h b/cds/intrusive/skip_list_rcu.h index c63e085e..40a321fd 100644 --- a/cds/intrusive/skip_list_rcu.h +++ b/cds/intrusive/skip_list_rcu.h @@ -318,7 +318,7 @@ namespace cds { namespace intrusive { - \p T - type to be stored in the list. The type must be based on \p skip_list::node (for \p skip_list::base_hook) or it must have a member of type \p skip_list::node (for \p skip_list::member_hook). - \p Traits - set traits, default is \p skip_list::traits - It is possible to declare option-based list with \p cds::intrusive::skip_list::make_traits metafunction + It is possible to declare option-based list with \p cds::intrusive::skip_list::make_traits metafunction instead of \p Traits template argument. @note Before including you should include appropriate RCU header file, diff --git a/cds/intrusive/striped_set.h b/cds/intrusive/striped_set.h index a5f7cd06..e0182def 100644 --- a/cds/intrusive/striped_set.h +++ b/cds/intrusive/striped_set.h @@ -34,10 +34,10 @@ namespace cds { namespace intrusive { Template arguments: - \p Container - the container class that is used as bucket table entry. The \p Container class should support an uniform interface described below. - - \p Options - options + - \p Options - options The \p %StripedSet class does not exactly dictate the type of container that should be used as a \p Container bucket. - Instead, the class supports different intrusive container type for the bucket, for exampe, + Instead, the class supports different intrusive container type for the bucket, for exampe, \p boost::intrusive::list, \p boost::intrusive::set and others. Remember that \p %StripedSet class algorithm ensures sequential blocking access to its bucket through the mutex type you specify @@ -47,7 +47,7 @@ namespace cds { namespace intrusive { - \p opt::mutex_policy - concurrent access policy. Available policies: \p striped_set::striping, \p striped_set::refinable. Default is \p %striped_set::striping. - - \p cds::opt::hash - hash functor. Default option value see opt::v::hash_selector + - \p cds::opt::hash - hash functor. Default option value see opt::v::hash_selector which selects default hash functor for your compiler. - \p cds::opt::compare - key comparison functor. No default functor is provided. If the option is not specified, the \p opt::less is used. diff --git a/cds/intrusive/striped_set/boost_unordered_set.h b/cds/intrusive/striped_set/boost_unordered_set.h index ea833054..9ec93699 100644 --- a/cds/intrusive/striped_set/boost_unordered_set.h +++ b/cds/intrusive/striped_set/boost_unordered_set.h @@ -178,9 +178,9 @@ namespace cds { namespace intrusive { namespace striped_set { } // namespace details #if CDS_COMPILER == CDS_COMPILER_INTEL && CDS_COMPILER_VERSION <= 1500 - template class adapt < boost::intrusive::unordered_set< T, O1, O2, O3, O4, O5, O6, O7, O8, O9, O10 >, Options... > diff --git a/cds/opt/options.h b/cds/opt/options.h index 55d05dc4..0c2f7e95 100644 --- a/cds/opt/options.h +++ b/cds/opt/options.h @@ -496,8 +496,8 @@ namespace opt { enum { padding = Padding & ~padding_flags }; public: - static CDS_CONSTEXPR const size_t c_nPadding = - static_cast(padding) == static_cast(cache_line_padding) ? cds::c_nCacheLineSize : + static CDS_CONSTEXPR const size_t c_nPadding = + static_cast(padding) == static_cast(cache_line_padding) ? cds::c_nCacheLineSize : static_cast(padding) == static_cast(no_special_padding) ? 0 : padding; static_assert( (c_nPadding & (c_nPadding - 1)) == 0, "Padding must be a power-of-two number" ); @@ -506,7 +506,7 @@ namespace opt { c_nPadding, c_nPadding == 0, sizeof( T ) < c_nPadding ? padding_datasize_less : sizeof( T ) == c_nPadding ? padding_datasize_equal : padding_datasize_greater, - (Padding & padding_tiny_data_only) != 0 + (Padding & padding_tiny_data_only) != 0 >::type type; }; diff --git a/cds/urcu/exempt_ptr.h b/cds/urcu/exempt_ptr.h index 1b052691..fa005ec8 100644 --- a/cds/urcu/exempt_ptr.h +++ b/cds/urcu/exempt_ptr.h @@ -45,7 +45,7 @@ namespace cds { namespace urcu { - \p NodeType - container's node type - \p ValueType - value type stored in container's node. For intrusive containers it is the same as \p NodeType - \p Disposer - a disposer functor - - \p Cast - a functor for casting from \p NodeType to \p ValueType. For intrusive containers + - \p Cast - a functor for casting from \p NodeType to \p ValueType. For intrusive containers the casting is usually disabled, i.e. \p Cast is \p void. */ template < diff --git a/change.log b/change.log index d54711b6..c3839415 100644 --- a/change.log +++ b/change.log @@ -23,6 +23,7 @@ - Changed: guarded_ptr and exempt_ptr have move semantics now. The container's extract() and get() member functions return the objects of that type. - Changed: improved cds::gc::HP and cds::gc::DHP internal implementation + - Changed: map member function insert_key() has been renamed to insert_with() 1.6.0 23.09.2014 General release diff --git a/tests/test-hdr/map/hdr_skiplist_map.h b/tests/test-hdr/map/hdr_skiplist_map.h index e21aaaa3..ef474f75 100644 --- a/tests/test-hdr/map/hdr_skiplist_map.h +++ b/tests/test-hdr/map/hdr_skiplist_map.h @@ -180,7 +180,7 @@ namespace map { CPPUNIT_CHECK( gp->first == nKey ); CPPUNIT_CHECK( gp->second.m_val == nKey * 2 ); gp.release(); - + gp = m.extract_with( wrapped_item( nKey ), wrapped_less()); CPPUNIT_ASSERT( gp ); CPPUNIT_ASSERT( !gp.empty()); diff --git a/tests/unit/map2/map_delodd.cpp b/tests/unit/map2/map_delodd.cpp index f1ecb3f4..655bc1f7 100644 --- a/tests/unit/map2/map_delodd.cpp +++ b/tests/unit/map2/map_delodd.cpp @@ -106,7 +106,7 @@ namespace boost { { return std::hash()( k.nKey ); } - + template <> struct hash {