remove CDS_CONSTEXPR_CONST macro

diff --git a/cds/algo/elimination_opt.h b/cds/algo/elimination_opt.h
index bca3bccefe4b5ee96302d224608ac88e8fd44367..4b41538fee2cb5c3efbd2387ef0250b20f9fe884 100644 (file)
--- a/cds/algo/elimination_opt.h
+++ b/cds/algo/elimination_opt.h
@@ -13,7 +13,7 @@ namespace cds { namespace opt {
         //@cond
         template <class Base> 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 484734469782f97f923f0da8004b04f81194f349..0fae9c7aea3ab741e801deac095cac3d3b0d4fae 100644 (file)
--- 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 37e6957554716668ea11b1aca95745ac4ed61029..f0f0c0bff91d04618210fc9818c148c232c7dd34 100644 (file)
--- 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 ebfd417ca43ed1c45aeb9e73fa75ecacf8676774..8b1b50ab76e30158d2ed96e908a4118184f3a934 100644 (file)
--- 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 ff485b7c58780cd6e03382fc2a21db235ebcdeac..a77da634b2d6f8c9258657c854b2a4b8eb58ba72 100644 (file)
--- 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 471708babce6d7228a9a44c99ee68050824866f3..00b0b646dc313293e0666616acfe1eb5c33b9211 100644 (file)
--- 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 405acc9ec8fea9f11201e0fbfae63737d47e6afe..ad0b9842a1d8b7ae2bf7526c94f9375ec10d58cd 100644 (file)
--- 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 b84839809fe322103b6d235c8d5e75b591d967e6..7b4fd422914409066461428f69ebd9d189cce394 100644 (file)
--- 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 78a37877a18045395b2ddf9239f924969561f95f..ce0301be06a9d08ed15d2433af65d6c5db75558d 100644 (file)
--- 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 fac698ec7fdeccbad04416be3735a90f15ef8b2d..f358968a7295e656ae3eb886f3d70580bef42254 100644 (file)
--- 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 58dd6cc19f5a8e7201e87c51d440b2e083baccf3..f1b9afe8b0ec1409fff13e4ccc9b9dc8823d9acf 100644 (file)
--- 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 a3ff3e550d619593fa8339b9248b437e67dc6b44..6b2ac2f20fee9c220a895ff3a439ee426e3ab4ad 100644 (file)
--- 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 a568cadd6ae9d5f5a2425fda7c6e8dd84644eba7..2bcdde406df9b29e0a85884914d7c6c53a20f786 100644 (file)
--- 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 40010e87ae134da32dc605971ab194a225dcd94b..fef238fb27c14c8912b73a1d7324afae6929d1b8 100644 (file)
--- 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 a4205a1bbbdb9ea0bc91e04867c284b1a72ffe03..8e17eb08ed6566691f9dcd3710c5bf12d20dc621 100644 (file)
--- 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 279081b38a9929186ccac112128e9d9a71dfd512..8f9446d10eb53257df13b7d37b62c39471ee6f17 100644 (file)
--- 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 cf1b0d63d7fa014288df66c2817443c6b8b72763..f3025c42f6e8412e53e8de003584c6234416331d 100644 (file)
--- 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 4b98525d68f4b652578a0be2b5f2620f51eb6f46..2701d0e1649e3d8f0993a50cf07a6d4b9cd0057c 100644 (file)
--- 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 1af003d62ad29be5a93b5c6224ad140c07bf3c85..227a3b8079424d9b48ba59f4b8c5d47880c16ece 100644 (file)
--- 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 c0a59c18f73b3206e9157c7ef717e96ff492c098..17493ecf0f2e3b4c52c51d2b6cec4cbd264a355f 100644 (file)
--- 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 2ca942ea7f6bf8fc24603a9ee93b33ef079bfd45..8ecd00c0c83896bcaa9d4c6efb0b91fa297890f0 100644 (file)
--- 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 0a30c939fa5445ddfdc2cdc77ff562de3a5ee24c..20e9a6536dfad6cbb6b973c625ed5104016f4c1f 100644 (file)
--- 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<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 39a84e909ef95cdada14979f63de70715a4994e1..8930634ea6c684e74b7cb1d42ebf856ec8a11f24 100644 (file)
--- 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 abb9fa7049fb97bdcd8735a3e622695ecd657eb9..328394beb6dd21b49e8ddd60ad22153a8d84fb34 100644 (file)
--- 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 366535d4de9d3a1f6d4407492d09bb854faf0c1e..b0bef10717d967b391f96c52e326e00b1ae26065 100644 (file)
--- 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 f70ec59fc0c8f4ba07bc18570e12957fd12d97db..4a334d15c2e4c39f8a6102d83d3c9bcaedc305bb 100644 (file)
--- 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 cc2acce56e3eac1a9b5b7f294babc32af3fa3a98..48dbd6046d9f969cd1f87d28ce1cb10e096e1607 100644 (file)
--- 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 69ab9ceefe27482211590774156d836f430ff322..11925a4dacf786f757e83fb1db1cee2a7c501be4 100644 (file)
--- 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 18fe794f287337d854106b9be03a214e4d542ff0..164c0c403e6650637afcc969685e2ba9c6b8f472 100644 (file)
--- 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 e5d17ee82923d526ee1222d581d7867b508dd89d..d1c17cfa5d8810e2b649ffa08f8bf7d515deba93 100644 (file)
--- 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 <tt>[0 .. c_nMaxHeight)</tt>

diff --git a/cds/intrusive/split_list_rcu.h b/cds/intrusive/split_list_rcu.h
index 1faf970e6e51756ecc2a4a224dc5cab6985a77e3..83e613ada9dd617dd20b330098a4ed8b0b4883e7 100644 (file)
--- 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 076afbc058b16523f198fb42079bbdfed904456c..8c2897ce724aec629b5edd4c8fc63435f6836b42 100644 (file)
--- 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 c56d9c731633dadffa73f7dfe460720eb2563c90..75821579f9641c820f48cb53bb1e6ea4f5acacbf 100644 (file)
--- 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 <typename Q, typename Alloc2=Alloc, bool Exp22 = c_bExp2>

diff --git a/doxygen/cds.doxy b/doxygen/cds.doxy
index cf679bfa8dec4896902fb034e254ab25e5f6470e..281d6be5ecf0f5b74a52e1d61ee9fb2581b4987e 100644 (file)
--- 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 5010c5e454c05d30981db83a3dafb8c4d8d77b86..c6fa491718180860d36e6e73c4102ea36dfeb85c 100644 (file)
--- 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<size_t>     m_nProducerCount;
-        static CDS_CONSTEXPR_CONST size_t c_nBadConsumer = 0xbadc0ffe;
+        static CDS_CONSTEXPR const size_t c_nBadConsumer = 0xbadc0ffe;
 
     protected:
         template <class Queue>

diff --git a/tests/unit/stack/stack_intrusive_pushpop.cpp b/tests/unit/stack/stack_intrusive_pushpop.cpp
index 73171efffd9ca3c2f4786f8a6811633161a144f4..6c4aa401989fa699ade90b8a5984312de28d91b7 100644 (file)
--- 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<size_t>  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 Stack>
         class Producer: public CppUnitMini::TestThread