From 20aaef87abaabab006f91392af9d37d8e666a78a Mon Sep 17 00:00:00 2001 From: khizmax Date: Wed, 22 Oct 2014 00:07:41 +0400 Subject: [PATCH] remove CDS_CONSTEXPR_CONST macro --- cds/algo/elimination_opt.h | 2 +- cds/compiler/clang/defs.h | 1 - cds/compiler/gcc/defs.h | 1 - cds/compiler/icl/defs.h | 1 - cds/compiler/vc/defs.h | 1 - cds/container/ellen_bintree_map_rcu.h | 2 +- cds/container/ellen_bintree_set_rcu.h | 2 +- cds/container/fcdeque.h | 2 +- cds/container/fcqueue.h | 4 ++-- cds/container/fcstack.h | 2 +- cds/container/lazy_kvlist_rcu.h | 2 +- cds/container/lazy_list_rcu.h | 2 +- cds/container/michael_kvlist_rcu.h | 2 +- cds/container/michael_list_rcu.h | 2 +- cds/container/michael_map_rcu.h | 2 +- cds/container/michael_set_rcu.h | 2 +- cds/container/optimistic_queue.h | 2 +- cds/container/skip_list_map_rcu.h | 2 +- cds/container/skip_list_set_rcu.h | 2 +- cds/container/split_list_map_rcu.h | 2 +- cds/container/split_list_set_rcu.h | 2 +- cds/container/treiber_stack.h | 4 ++-- cds/details/marked_ptr.h | 4 ++-- cds/intrusive/ellen_bintree_rcu.h | 2 +- cds/intrusive/fcqueue.h | 4 ++-- cds/intrusive/fcstack.h | 2 +- cds/intrusive/lazy_list_rcu.h | 2 +- cds/intrusive/michael_list_rcu.h | 2 +- cds/intrusive/michael_set_rcu.h | 2 +- cds/intrusive/skip_list_rcu.h | 2 +- cds/intrusive/split_list_rcu.h | 2 +- cds/intrusive/treiber_stack.h | 6 +++--- cds/opt/buffer.h | 2 +- doxygen/cds.doxy | 8 +------- tests/unit/queue/intrusive_queue_reader_writer.cpp | 2 +- tests/unit/stack/stack_intrusive_pushpop.cpp | 4 ++-- 36 files changed, 39 insertions(+), 49 deletions(-) diff --git a/cds/algo/elimination_opt.h b/cds/algo/elimination_opt.h index bca3bcce..4b41538f 100644 --- a/cds/algo/elimination_opt.h +++ b/cds/algo/elimination_opt.h @@ -13,7 +13,7 @@ namespace cds { namespace opt { //@cond template struct pack: public Base { - static CDS_CONSTEXPR_CONST bool enable_elimination = Enable; + static CDS_CONSTEXPR const bool enable_elimination = Enable; }; //@endcond }; diff --git a/cds/compiler/clang/defs.h b/cds/compiler/clang/defs.h index 48473446..0fae9c7a 100644 --- a/cds/compiler/clang/defs.h +++ b/cds/compiler/clang/defs.h @@ -34,7 +34,6 @@ #define CDS_CXX11_INLINE_NAMESPACE_SUPPORT #define CDS_CONSTEXPR constexpr -#define CDS_CONSTEXPR_CONST constexpr const #define CDS_NOEXCEPT_SUPPORT noexcept #define CDS_NOEXCEPT_SUPPORT_(expr) noexcept(expr) diff --git a/cds/compiler/gcc/defs.h b/cds/compiler/gcc/defs.h index 37e69575..f0f0c0bf 100644 --- a/cds/compiler/gcc/defs.h +++ b/cds/compiler/gcc/defs.h @@ -35,7 +35,6 @@ // noexcept #define CDS_NOEXCEPT_SUPPORT noexcept #define CDS_NOEXCEPT_SUPPORT_(expr) noexcept(expr) -#define CDS_CONSTEXPR_CONST constexpr const // C++11 thread_local keyword #define CDS_CXX11_THREAD_LOCAL_SUPPORT diff --git a/cds/compiler/icl/defs.h b/cds/compiler/icl/defs.h index ebfd417c..8b1b50ab 100644 --- a/cds/compiler/icl/defs.h +++ b/cds/compiler/icl/defs.h @@ -79,7 +79,6 @@ #endif #define CDS_CONSTEXPR constexpr -#define CDS_CONSTEXPR_CONST constexpr const #define CDS_NOEXCEPT_SUPPORT noexcept #define CDS_NOEXCEPT_SUPPORT_(expr) noexcept(expr) diff --git a/cds/compiler/vc/defs.h b/cds/compiler/vc/defs.h index ff485b7c..a77da634 100644 --- a/cds/compiler/vc/defs.h +++ b/cds/compiler/vc/defs.h @@ -79,7 +79,6 @@ // constexpr is not yet supported #define CDS_CONSTEXPR -#define CDS_CONSTEXPR_CONST const // noexcept is not yet supported //#define CDS_NOEXCEPT_SUPPORT noexcept diff --git a/cds/container/ellen_bintree_map_rcu.h b/cds/container/ellen_bintree_map_rcu.h index 471708ba..00b0b646 100644 --- a/cds/container/ellen_bintree_map_rcu.h +++ b/cds/container/ellen_bintree_map_rcu.h @@ -122,7 +122,7 @@ namespace cds { namespace container { typedef typename base_class::node_allocator node_allocator ; ///< Internal node allocator typedef typename base_class::update_desc_allocator update_desc_allocator ; ///< Update descriptor allocator - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions do not require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions do not require external locking protected: //@cond diff --git a/cds/container/ellen_bintree_set_rcu.h b/cds/container/ellen_bintree_set_rcu.h index 405acc9e..ad0b9842 100644 --- a/cds/container/ellen_bintree_set_rcu.h +++ b/cds/container/ellen_bintree_set_rcu.h @@ -158,7 +158,7 @@ namespace cds { namespace container { typedef typename base_class::node_allocator node_allocator ; ///< Internal node allocator typedef typename base_class::update_desc_allocator update_desc_allocator ; ///< Update descriptor allocator - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions do not require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions do not require external locking protected: //@cond diff --git a/cds/container/fcdeque.h b/cds/container/fcdeque.h index b8483980..7b4fd422 100644 --- a/cds/container/fcdeque.h +++ b/cds/container/fcdeque.h @@ -121,7 +121,7 @@ namespace cds { namespace container { typedef Traits traits; ///< Deque type traits typedef typename traits::stat stat; ///< Internal statistics type - static CDS_CONSTEXPR_CONST bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled + static CDS_CONSTEXPR const bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled protected: //@cond diff --git a/cds/container/fcqueue.h b/cds/container/fcqueue.h index 78a37877..ce0301be 100644 --- a/cds/container/fcqueue.h +++ b/cds/container/fcqueue.h @@ -50,7 +50,7 @@ namespace cds { namespace container { struct traits: public cds::algo::flat_combining::type_traits { typedef empty_stat stat; ///< Internal statistics - static CDS_CONSTEXPR_CONST bool enable_elimination = false; ///< Enable \ref cds_elimination_description "elimination" + static CDS_CONSTEXPR const bool enable_elimination = false; ///< Enable \ref cds_elimination_description "elimination" }; /// Metafunction converting option list to traits @@ -110,7 +110,7 @@ namespace cds { namespace container { typedef Traits traits; ///< Queue type traits typedef typename traits::stat stat; ///< Internal statistics type - static CDS_CONSTEXPR_CONST bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled + static CDS_CONSTEXPR const bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled protected: //@cond diff --git a/cds/container/fcstack.h b/cds/container/fcstack.h index fac698ec..f358968a 100644 --- a/cds/container/fcstack.h +++ b/cds/container/fcstack.h @@ -108,7 +108,7 @@ namespace cds { namespace container { typedef Traits traits; ///< Stack traits typedef typename traits::stat stat; ///< Internal statistics type - static CDS_CONSTEXPR_CONST bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled + static CDS_CONSTEXPR const bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled protected: //@cond diff --git a/cds/container/lazy_kvlist_rcu.h b/cds/container/lazy_kvlist_rcu.h index 58dd6cc1..f1b9afe8 100644 --- a/cds/container/lazy_kvlist_rcu.h +++ b/cds/container/lazy_kvlist_rcu.h @@ -121,7 +121,7 @@ namespace cds { namespace container { typedef typename base_class::rcu_check_deadlock rcu_check_deadlock ; ///< RCU deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking protected: //@cond diff --git a/cds/container/lazy_list_rcu.h b/cds/container/lazy_list_rcu.h index a3ff3e55..6b2ac2f2 100644 --- a/cds/container/lazy_list_rcu.h +++ b/cds/container/lazy_list_rcu.h @@ -130,7 +130,7 @@ namespace cds { namespace container { typedef typename base_class::rcu_check_deadlock rcu_check_deadlock ; ///< Deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking protected: //@cond diff --git a/cds/container/michael_kvlist_rcu.h b/cds/container/michael_kvlist_rcu.h index a568cadd..2bcdde40 100644 --- a/cds/container/michael_kvlist_rcu.h +++ b/cds/container/michael_kvlist_rcu.h @@ -122,7 +122,7 @@ namespace cds { namespace container { typedef typename base_class::rcu_check_deadlock rcu_check_deadlock ; ///< RCU deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking protected: //@cond diff --git a/cds/container/michael_list_rcu.h b/cds/container/michael_list_rcu.h index 40010e87..fef238fb 100644 --- a/cds/container/michael_list_rcu.h +++ b/cds/container/michael_list_rcu.h @@ -121,7 +121,7 @@ namespace cds { namespace container { typedef typename base_class::rcu_check_deadlock rcu_check_deadlock ; ///< RCU deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; ///< Group of \p extract_xxx functions require external locking protected: //@cond diff --git a/cds/container/michael_map_rcu.h b/cds/container/michael_map_rcu.h index a4205a1b..8e17eb08 100644 --- a/cds/container/michael_map_rcu.h +++ b/cds/container/michael_map_rcu.h @@ -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 diff --git a/cds/container/michael_set_rcu.h b/cds/container/michael_set_rcu.h index 279081b3..8f9446d1 100644 --- a/cds/container/michael_set_rcu.h +++ b/cds/container/michael_set_rcu.h @@ -129,7 +129,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 diff --git a/cds/container/optimistic_queue.h b/cds/container/optimistic_queue.h index cf1b0d63..f3025c42 100644 --- a/cds/container/optimistic_queue.h +++ b/cds/container/optimistic_queue.h @@ -191,7 +191,7 @@ namespace cds { namespace container { typedef typename base_class::stat stat; ///< Internal statistics policy used typedef typename base_class::memory_model memory_model; ///< Memory ordering. See \p cds::opt::memory_model option - static CDS_CONSTEXPR_CONST size_t c_nHazardPtrCount = base_class::c_nHazardPtrCount; ///< Count of hazard pointer required for the algorithm + static CDS_CONSTEXPR const size_t c_nHazardPtrCount = base_class::c_nHazardPtrCount; ///< Count of hazard pointer required for the algorithm protected: //@cond diff --git a/cds/container/skip_list_map_rcu.h b/cds/container/skip_list_map_rcu.h index 4b98525d..2701d0e1 100644 --- a/cds/container/skip_list_map_rcu.h +++ b/cds/container/skip_list_map_rcu.h @@ -150,7 +150,7 @@ namespace cds { namespace container { public: typedef typename base_class::rcu_lock rcu_lock; ///< RCU scoped lock /// Group of \p extract_xxx functions do not require external locking - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; /// pointer to extracted node typedef cds::urcu::exempt_ptr< gc, node_type, value_type, typename maker::intrusive_type_traits::disposer > exempt_ptr; diff --git a/cds/container/skip_list_set_rcu.h b/cds/container/skip_list_set_rcu.h index 1af003d6..227a3b80 100644 --- a/cds/container/skip_list_set_rcu.h +++ b/cds/container/skip_list_set_rcu.h @@ -182,7 +182,7 @@ namespace cds { namespace container { public: typedef typename base_class::rcu_lock rcu_lock; ///< RCU scoped lock /// Group of \p extract_xxx functions do not require external locking - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; /// pointer to extracted node typedef cds::urcu::exempt_ptr< gc, node_type, value_type, typename maker::intrusive_type_traits::disposer > exempt_ptr; diff --git a/cds/container/split_list_map_rcu.h b/cds/container/split_list_map_rcu.h index c0a59c18..17493ecf 100644 --- a/cds/container/split_list_map_rcu.h +++ b/cds/container/split_list_map_rcu.h @@ -181,7 +181,7 @@ namespace cds { namespace container { typedef typename base_class::rcu_lock rcu_lock ; ///< RCU scoped lock typedef typename base_class::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 = base_class::c_bExtractLockExternal; + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; protected: //@cond diff --git a/cds/container/split_list_set_rcu.h b/cds/container/split_list_set_rcu.h index 2ca942ea..8ecd00c0 100644 --- a/cds/container/split_list_set_rcu.h +++ b/cds/container/split_list_set_rcu.h @@ -192,7 +192,7 @@ namespace cds { namespace container { typedef typename base_class::rcu_lock rcu_lock ; ///< RCU scoped lock /// Group of \p extract_xxx functions require external locking if underlying ordered list requires that - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; + static CDS_CONSTEXPR const bool c_bExtractLockExternal = base_class::c_bExtractLockExternal; protected: //@cond diff --git a/cds/container/treiber_stack.h b/cds/container/treiber_stack.h index 0a30c939..20e9a653 100644 --- a/cds/container/treiber_stack.h +++ b/cds/container/treiber_stack.h @@ -52,7 +52,7 @@ namespace cds { namespace container { ///@{ /// Enable elimination back-off; by default, it is disabled - static CDS_CONSTEXPR_CONST bool enable_elimination = false; + static CDS_CONSTEXPR const bool enable_elimination = false; /// Back-off strategy to wait for elimination, default is cds::backoff::delay<> typedef cds::backoff::delay<> elimination_backoff; @@ -161,7 +161,7 @@ namespace cds { namespace container { { typedef cds::intrusive::treiber_stack::base_hook< cds::opt::gc > hook; typedef node_deallocator disposer; - static CDS_CONSTEXPR_CONST opt::link_check_type link_checker = cds::intrusive::treiber_stack::traits::link_checker; + static CDS_CONSTEXPR const opt::link_check_type link_checker = cds::intrusive::treiber_stack::traits::link_checker; }; // Result of metafunction diff --git a/cds/details/marked_ptr.h b/cds/details/marked_ptr.h index 39a84e90..8930634e 100644 --- a/cds/details/marked_ptr.h +++ b/cds/details/marked_ptr.h @@ -27,8 +27,8 @@ namespace cds { public: typedef T value_type ; ///< type of value the class points to typedef T * pointer_type ; ///< type of pointer - static CDS_CONSTEXPR_CONST uintptr_t bitmask = Bitmask ; ///< bitfield bitmask - static CDS_CONSTEXPR_CONST uintptr_t pointer_bitmask = ~bitmask ; ///< pointer bitmask + static CDS_CONSTEXPR const uintptr_t bitmask = Bitmask; ///< bitfield bitmask + static CDS_CONSTEXPR const uintptr_t pointer_bitmask = ~bitmask; ///< pointer bitmask public: /// Constructs null marked pointer. The flag is cleared. diff --git a/cds/intrusive/ellen_bintree_rcu.h b/cds/intrusive/ellen_bintree_rcu.h index abb9fa70..328394be 100644 --- a/cds/intrusive/ellen_bintree_rcu.h +++ b/cds/intrusive/ellen_bintree_rcu.h @@ -512,7 +512,7 @@ namespace cds { namespace intrusive { typedef typename gc::scoped_lock rcu_lock; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = false; ///< Group of \p extract_xxx functions do not require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = false; ///< Group of \p extract_xxx functions do not require external locking protected: //@cond diff --git a/cds/intrusive/fcqueue.h b/cds/intrusive/fcqueue.h index 366535d4..b0bef107 100644 --- a/cds/intrusive/fcqueue.h +++ b/cds/intrusive/fcqueue.h @@ -47,7 +47,7 @@ namespace cds { namespace intrusive { { typedef cds::intrusive::opt::v::empty_disposer disposer ; ///< Disposer to erase removed elements. Used only in \p FCQueue::clear() function typedef empty_stat stat; ///< Internal statistics - static CDS_CONSTEXPR_CONST bool enable_elimination = false; ///< Enable \ref cds_elimination_description "elimination" + static CDS_CONSTEXPR const bool enable_elimination = false; ///< Enable \ref cds_elimination_description "elimination" }; /// Metafunction converting option list to traits @@ -108,7 +108,7 @@ namespace cds { namespace intrusive { typedef typename traits::disposer disposer; ///< The disposer functor. The disposer is used only in \ref clear() function typedef typename traits::stat stat; ///< Internal statistics type - static CDS_CONSTEXPR_CONST bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled + static CDS_CONSTEXPR const bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled protected: //@cond diff --git a/cds/intrusive/fcstack.h b/cds/intrusive/fcstack.h index f70ec59f..4a334d15 100644 --- a/cds/intrusive/fcstack.h +++ b/cds/intrusive/fcstack.h @@ -109,7 +109,7 @@ namespace cds { namespace intrusive { typedef typename traits::disposer disposer; ///< The disposer functor. The disposer is used only in \ref clear() function typedef typename traits::stat stat; ///< Internal statistics type - static CDS_CONSTEXPR_CONST bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled + static CDS_CONSTEXPR const bool c_bEliminationEnabled = traits::enable_elimination; ///< \p true if elimination is enabled protected: //@cond diff --git a/cds/intrusive/lazy_list_rcu.h b/cds/intrusive/lazy_list_rcu.h index cc2acce5..48dbd604 100644 --- a/cds/intrusive/lazy_list_rcu.h +++ b/cds/intrusive/lazy_list_rcu.h @@ -123,7 +123,7 @@ namespace cds { namespace intrusive { typedef typename options::rcu_check_deadlock rcu_check_deadlock ; ///< Deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = true; ///< Group of \p extract_xxx functions require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = true; ///< Group of \p extract_xxx functions require external locking //@cond // Rebind options (split-list support) diff --git a/cds/intrusive/michael_list_rcu.h b/cds/intrusive/michael_list_rcu.h index 69ab9cee..11925a4d 100644 --- a/cds/intrusive/michael_list_rcu.h +++ b/cds/intrusive/michael_list_rcu.h @@ -75,7 +75,7 @@ namespace cds { namespace intrusive { typedef typename options::rcu_check_deadlock rcu_check_deadlock ; ///< Deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = true; ///< Group of \p extract_xxx functions require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = true; ///< Group of \p extract_xxx functions require external locking //@cond // Rebind options (split-list support) diff --git a/cds/intrusive/michael_set_rcu.h b/cds/intrusive/michael_set_rcu.h index 18fe794f..164c0c40 100644 --- a/cds/intrusive/michael_set_rcu.h +++ b/cds/intrusive/michael_set_rcu.h @@ -92,7 +92,7 @@ namespace cds { namespace intrusive { 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 diff --git a/cds/intrusive/skip_list_rcu.h b/cds/intrusive/skip_list_rcu.h index e5d17ee8..d1c17cfa 100644 --- a/cds/intrusive/skip_list_rcu.h +++ b/cds/intrusive/skip_list_rcu.h @@ -543,7 +543,7 @@ namespace cds { namespace intrusive { typedef typename options::stat stat ; ///< internal statistics type typedef typename options::rcu_check_deadlock rcu_check_deadlock ; ///< Deadlock checking policy typedef typename gc::scoped_lock rcu_lock ; ///< RCU scoped lock - static CDS_CONSTEXPR_CONST bool c_bExtractLockExternal = false; ///< Group of \p extract_xxx functions does not require external locking + static CDS_CONSTEXPR const bool c_bExtractLockExternal = false; ///< Group of \p extract_xxx functions does not require external locking /// Max node height. The actual node height should be in range [0 .. c_nMaxHeight) diff --git a/cds/intrusive/split_list_rcu.h b/cds/intrusive/split_list_rcu.h index 1faf970e..83e613ad 100644 --- a/cds/intrusive/split_list_rcu.h +++ b/cds/intrusive/split_list_rcu.h @@ -85,7 +85,7 @@ namespace cds { namespace intrusive { typedef typename ordered_list::rcu_lock rcu_lock ; ///< RCU scoped lock typedef typename ordered_list::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 = ordered_list::c_bExtractLockExternal; + static CDS_CONSTEXPR const bool c_bExtractLockExternal = ordered_list::c_bExtractLockExternal; typedef typename options::item_counter item_counter ; ///< Item counter type typedef typename options::back_off back_off ; ///< back-off strategy for spinning diff --git a/cds/intrusive/treiber_stack.h b/cds/intrusive/treiber_stack.h index 076afbc0..8c2897ce 100644 --- a/cds/intrusive/treiber_stack.h +++ b/cds/intrusive/treiber_stack.h @@ -174,7 +174,7 @@ namespace cds { namespace intrusive { typedef treiber_stack::empty_stat stat; /// Link checking, see \p cds::opt::link_checker - static CDS_CONSTEXPR_CONST opt::link_check_type link_checker = opt::debug_check_link; + static CDS_CONSTEXPR const opt::link_check_type link_checker = opt::debug_check_link; /** @name Elimination back-off traits The following traits is used only if elimination enabled @@ -182,7 +182,7 @@ namespace cds { namespace intrusive { ///@{ /// Enable elimination back-off; by default, it is disabled - static CDS_CONSTEXPR_CONST bool enable_elimination = false; + static CDS_CONSTEXPR const bool enable_elimination = false; /// Back-off strategy to wait for elimination, default is cds::backoff::delay<> typedef cds::backoff::delay<> elimination_backoff; @@ -605,7 +605,7 @@ namespace cds { namespace intrusive { public: // related to elimination back-off /// Elimination back-off is enabled or not - static CDS_CONSTEXPR_CONST bool enable_elimination = traits::enable_elimination; + static CDS_CONSTEXPR const bool enable_elimination = traits::enable_elimination; /// back-off strategy used to wait for elimination typedef typename traits::elimination_backoff elimination_backoff_type; /// Lock type used in elimination back-off diff --git a/cds/opt/buffer.h b/cds/opt/buffer.h index c56d9c73..75821579 100644 --- a/cds/opt/buffer.h +++ b/cds/opt/buffer.h @@ -149,7 +149,7 @@ namespace cds { namespace opt { { public: typedef T value_type ; ///< Value type - static CDS_CONSTEXPR_CONST bool c_bExp2 = Exp2; ///< \p Exp2 flag + static CDS_CONSTEXPR const bool c_bExp2 = Exp2; ///< \p Exp2 flag /// Rebind buffer for other template parameters template diff --git a/doxygen/cds.doxy b/doxygen/cds.doxy index cf679bfa..281d6be5 100644 --- a/doxygen/cds.doxy +++ b/doxygen/cds.doxy @@ -1394,17 +1394,11 @@ INCLUDE_FILE_PATTERNS = PREDEFINED = CDS_BUILD_BITS=64 \ CDS_DOXYGEN_INVOKED \ - cds_std=std \ CDS_URCU_SIGNAL_HANDLING_ENABLED \ CDS_CXX11_INLINE_NAMESPACE_SUPPORT \ CDS_CXX11_INLINE_NAMESPACE=inline \ - CDS_CXX11_DECLTYPE_SUPPORT \ CDS_NOEXCEPT=noexcept() \ - CDS_CONSTEXPR=constexpr \ - CDS_CONSTEXPR_CONST="constexpr const" \ - CDS_ATOMIC=std \ - CDS_DELETE_SPECIFIER="=delete"\ - CDS_DEFAULT_SPECIFIER="=default" + CDS_CONSTEXPR=constexpr # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/tests/unit/queue/intrusive_queue_reader_writer.cpp b/tests/unit/queue/intrusive_queue_reader_writer.cpp index 5010c5e4..c6fa4917 100644 --- a/tests/unit/queue/intrusive_queue_reader_writer.cpp +++ b/tests/unit/queue/intrusive_queue_reader_writer.cpp @@ -207,7 +207,7 @@ namespace queue { protected: size_t m_nThreadPushCount; atomics::atomic m_nProducerCount; - static CDS_CONSTEXPR_CONST size_t c_nBadConsumer = 0xbadc0ffe; + static CDS_CONSTEXPR const size_t c_nBadConsumer = 0xbadc0ffe; protected: template diff --git a/tests/unit/stack/stack_intrusive_pushpop.cpp b/tests/unit/stack/stack_intrusive_pushpop.cpp index 73171eff..6c4aa401 100644 --- a/tests/unit/stack/stack_intrusive_pushpop.cpp +++ b/tests/unit/stack/stack_intrusive_pushpop.cpp @@ -40,8 +40,8 @@ namespace istack { class IntrusiveStack_PushPop: public CppUnitMini::TestCase { atomics::atomic m_nWorkingProducers; - static CDS_CONSTEXPR_CONST size_t c_nValArraySize = 1024; - static CDS_CONSTEXPR_CONST size_t c_nBadConsumer = 0xbadc0ffe; + static CDS_CONSTEXPR const size_t c_nValArraySize = 1024; + static CDS_CONSTEXPR const size_t c_nBadConsumer = 0xbadc0ffe; template class Producer: public CppUnitMini::TestThread -- 2.34.1