remove CDS_CONSTEXPR_CONST macro

[libcds.git] / cds / container / michael_map_rcu.h

diff --git a/cds/container/michael_map_rcu.h b/cds/container/michael_map_rcu.h
index 4df00403ff163f3d8ab90829c99f18b7cebd7f66..8e17eb08ed6566691f9dcd3710c5bf12d20dc621 100644 (file)
--- a/cds/container/michael_map_rcu.h
+++ b/cds/container/michael_map_rcu.h
@@ -3,7 +3,7 @@
 #ifndef __CDS_CONTAINER_MICHAEL_MAP_RCU_H
 #define __CDS_CONTAINER_MICHAEL_MAP_RCU_H
 
-#include <cds/container/michael_map_base.h>
+#include <cds/container/details/michael_map_base.h>
 #include <cds/details/allocator.h>
 
 namespace cds { namespace container {
@@ -80,7 +80,7 @@ namespace cds { namespace container {
         typedef typename bucket_type::rcu_lock      rcu_lock   ; ///< RCU scoped lock
         typedef typename bucket_type::exempt_ptr    exempt_ptr ; ///< pointer to extracted node
         /// Group of \p extract_xxx functions require external locking if underlying ordered list requires that
-        static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = bucket_type::c_bExtractLockExternal;
+        static CDS_CONSTEXPR const bool c_bExtractLockExternal = bucket_type::c_bExtractLockExternal;
 
     protected:
         item_counter    m_ItemCounter   ;   ///< Item counter
@@ -379,7 +379,7 @@ namespace cds { namespace container {
 
             User-defined functor \p func should guarantee that during changing item's value no any other changes
             could be made on this map's item by concurrent threads.
-            The user-defined functor can be passed by reference using <tt>boost::ref</tt>
+            The user-defined functor can be passed by reference using \p std::ref
             and it is called only if inserting is successful.
 
             The key_type should be constructible from value of type \p K.
@@ -431,7 +431,7 @@ namespace cds { namespace container {
             however, \p func must guarantee that during changing no any other modifications
             could be made on this item by concurrent threads.
 
-            You may pass \p func argument by reference using <tt>boost::ref</tt>.
+            You may pass \p func argument by reference using \p std::ref
 
             The function applies RCU lock internally.
 
@@ -619,7 +619,7 @@ namespace cds { namespace container {
             \endcode
             where \p item is the item found.
 
-            You may pass \p f argument by reference using <tt>boost::ref</tt> or cds::ref.
+            You may pass \p f argument by reference using \p std::ref.
 
             The functor may change \p item.second. Note that the functor is only guarantee
             that \p item cannot be disposed during functor is executing.