Docfix, formatting, minor bugs

diff --git a/cds/container/bronson_avltree_map_rcu.h b/cds/container/bronson_avltree_map_rcu.h
index 24a6d73e959ec43ad00f09f30bf3237c6385c4af..723fb109fdf20f1d56d4a20ff8ad77e931c96a3e 100644 (file)
--- a/cds/container/bronson_avltree_map_rcu.h
+++ b/cds/container/bronson_avltree_map_rcu.h
@@ -437,7 +437,7 @@ namespace cds { namespace container {
             return base_class::extract_min();
         }
 
-        /// Extracts minimal key key and corresponding value
+        /// Extracts minimal key and corresponding value
         /**
             Returns \p exempt_ptr to the leftmost item.
             If the tree is empty, returns empty \p exempt_ptr.
@@ -469,7 +469,7 @@ namespace cds { namespace container {
             return base_class::extract_min( f );
         }
 
-        /// Extracts minimal key key and corresponding value
+        /// Extracts minimal key and corresponding value
         /**
             This function is a shortcut for the following call:
             \code

diff --git a/cds/container/details/ellen_bintree_base.h b/cds/container/details/ellen_bintree_base.h
index 9805c177e666992f2d0028475c18b29c77aa5ba8..073a87a2f90968e94cb708bcaa21cc0adb3eb125 100644 (file)
--- a/cds/container/details/ellen_bintree_base.h
+++ b/cds/container/details/ellen_bintree_base.h
@@ -88,14 +88,14 @@ namespace cds { namespace container {
 
             /// Copy constructor
             template <typename... Args>
-            node( Args const&... args)
+            node( Args const&... args )
                 : m_Value( args... )
             {}
 
             /// Move constructor
             template <typename... Args>
-            node( Args&&... args)
-                : m_Value( std::forward<Args>(args)... )
+            node( Args&&... args )
+                : m_Value( std::forward<Args>( args )... )
             {}
         };
 
@@ -127,15 +127,15 @@ namespace cds { namespace container {
         {
             /// Key extracting functor (only for \p EllenBinTreeSet)
             /**
-                You should explicit define a valid functor.
-                The functor has the following prototype:
+                This is mandatory functor for \p %EllenBinTreeSet.
+                It has the following prototype:
                 \code
                 struct key_extractor {
                     void operator ()( Key& dest, T const& src );
                 };
                 \endcode
                 It should initialize \p dest key from \p src data.
-                The functor is used to initialize internal nodes of \p EllenBinTreeSet
+                The functor is used to initialize internal nodes of \p %EllenBinTreeSet
             */
             typedef opt::none           key_extractor;
 
@@ -359,7 +359,7 @@ namespace cds { namespace container {
 
                 typedef typename cds::opt::details::make_comparator< value_type, original_traits, false >::type key_comparator;
 
-                typedef cds::details::Allocator< leaf_node, typename original_traits::allocator>  cxx_leaf_node_allocator;
+                typedef cds::details::Allocator< leaf_node, typename original_traits::allocator> cxx_leaf_node_allocator;
                 struct leaf_deallocator
                 {
                     void operator()( leaf_node * p ) const
@@ -370,14 +370,14 @@ namespace cds { namespace container {
 
                 struct intrusive_traits: public original_traits
                 {
-                    typedef cds::intrusive::ellen_bintree::base_hook< cds::opt::gc< gc > >  hook;
+                    typedef cds::intrusive::ellen_bintree::base_hook< cds::opt::gc< gc >> hook;
                     typedef intrusive_key_extractor key_extractor;
                     typedef leaf_deallocator        disposer;
                     typedef cds::details::compare_wrapper< leaf_node, key_comparator, value_accessor > compare;
                 };
 
                 // Metafunction result
-                typedef cds::intrusive::EllenBinTree< gc, key_type, leaf_node, intrusive_traits >    type;
+                typedef cds::intrusive::EllenBinTree< gc, key_type, leaf_node, intrusive_traits > type;
             };
 
             template < class GC, typename Key, typename T, class Traits>

diff --git a/cds/container/ellen_bintree_set_rcu.h b/cds/container/ellen_bintree_set_rcu.h
index 4ede50a27853111ae4f023ccb0fd9dabd3b63e3d..2acbe887bd38786d527b22fc1208834439ddd2cb 100644 (file)
--- a/cds/container/ellen_bintree_set_rcu.h
+++ b/cds/container/ellen_bintree_set_rcu.h
@@ -296,7 +296,7 @@ namespace cds { namespace container {
         template <typename... Args>
         bool emplace( Args&&... args )
         {
-            scoped_node_ptr sp( cxx_leaf_node_allocator().New( std::forward<Args>(args)... ));
+            scoped_node_ptr sp( cxx_leaf_node_allocator().MoveNew( std::forward<Args>(args)... ));
             if ( base_class::insert( *sp.get() )) {
                 sp.release();
                 return true;

diff --git a/cds/container/impl/bronson_avltree_map_rcu.h b/cds/container/impl/bronson_avltree_map_rcu.h
index 1755dcdcbb0a09dfd0c25f8d734eee79364dbfec..0db75ce83fc3339aaae5351e92c70a056d3998eb 100644 (file)
--- a/cds/container/impl/bronson_avltree_map_rcu.h
+++ b/cds/container/impl/bronson_avltree_map_rcu.h
@@ -436,7 +436,7 @@ namespace cds { namespace container {
             return exempt_ptr(do_extract_min( []( key_type const& ) {}));
         }
 
-        /// Extracts minimal key key and corresponding value
+        /// Extracts minimal key and corresponding value
         /**
             Returns \p exempt_ptr to the leftmost item.
             If the tree is empty, returns empty \p exempt_ptr.
@@ -468,7 +468,7 @@ namespace cds { namespace container {
             return exempt_ptr(do_extract_min( [&f]( key_type const& key ) { f(key); }));
         }
 
-        /// Extracts minimal key key and corresponding value
+        /// Extracts minimal key and corresponding value
         /**
             This function is a shortcut for the following call:
             \code

diff --git a/cds/container/impl/ellen_bintree_set.h b/cds/container/impl/ellen_bintree_set.h
index 538e447ec9eaec73f59f023231c71f1283deeecc..94a29a5dadf6a1d7e0f41832a3c83578a8b374f4 100644 (file)
--- a/cds/container/impl/ellen_bintree_set.h
+++ b/cds/container/impl/ellen_bintree_set.h
@@ -290,7 +290,7 @@ namespace cds { namespace container {
         template <typename... Args>
         bool emplace( Args&&... args )
         {
-            scoped_node_ptr sp( cxx_leaf_node_allocator().New( std::forward<Args>(args)... ));
+            scoped_node_ptr sp( cxx_leaf_node_allocator().MoveNew( std::forward<Args>(args)... ));
             if ( base_class::insert( *sp.get() )) {
                 sp.release();
                 return true;

diff --git a/cds/intrusive/details/ellen_bintree_base.h b/cds/intrusive/details/ellen_bintree_base.h
index 6d29a2d792560ecb5a12b85d8ec8c1397e63b357..3b04a962f21ea1019ea7b75b9d1c5b6f5fcc35eb 100644 (file)
--- a/cds/intrusive/details/ellen_bintree_base.h
+++ b/cds/intrusive/details/ellen_bintree_base.h
@@ -96,7 +96,7 @@ namespace cds { namespace intrusive {
                 delete_info     dInfo;
             };
 
-            update_desc *   pNextRetire     ;   // for local retired list (RCU)
+            update_desc *   pNextRetire; // for local retired list (RCU)
 
             update_desc()
                 : pNextRetire( nullptr )