ensure() and find(key) member functions are declared using [[deprecated]] attribute

diff --git a/cds/container/ellen_bintree_map_rcu.h b/cds/container/ellen_bintree_map_rcu.h
index 15a2ec12324bb790bb187a331a06ba1b4de55320..d706d2c3c7c9e0ace946c0d54b3a01f5e7ce062f 100644 (file)
--- a/cds/container/ellen_bintree_map_rcu.h
+++ b/cds/container/ellen_bintree_map_rcu.h
@@ -264,8 +264,8 @@ namespace cds { namespace container {
             return res;
         }
         //@cond
-        // Deprecated, use update()
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func func )
         {
             return update( key, func, true );
@@ -463,8 +463,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( K const& key )
         {
             return contains( key );
@@ -485,8 +485,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::key_accessor >() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( K const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/ellen_bintree_set_rcu.h b/cds/container/ellen_bintree_set_rcu.h
index 6a248dfaa1a5af2905996157015b156756adcc2c..d1cdea737f83b0d4459e143a894ef31b6e954855 100644 (file)
--- a/cds/container/ellen_bintree_set_rcu.h
+++ b/cds/container/ellen_bintree_set_rcu.h
@@ -251,8 +251,8 @@ namespace cds { namespace container {
             return bRes;
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( const Q& val, Func func )
         {
             return update( val, func, true );
@@ -501,8 +501,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key ) const
         {
             return contains( key );
@@ -524,8 +524,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >());
         }
         //@cond
-        // DEprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/container/impl/ellen_bintree_map.h b/cds/container/impl/ellen_bintree_map.h
index 7c5f831bceeffbad6034bdccd25eeae048b6b89d..b3a2feefb9c0e86901ea863f09c55c105cdd8879 100644 (file)
--- a/cds/container/impl/ellen_bintree_map.h
+++ b/cds/container/impl/ellen_bintree_map.h
@@ -255,8 +255,8 @@ namespace cds { namespace container {
             return res;
         }
         //@cond
-        // Deprecated, use update()
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func func )
         {
             return update( key, func, true );
@@ -449,8 +449,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( K const& key )
         {
             return contains( key );
@@ -470,8 +470,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::key_accessor >() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( K const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/impl/ellen_bintree_set.h b/cds/container/impl/ellen_bintree_set.h
index be6ece3554b8d1f7b5267b7cf2fdbdd6a493afb3..96afa74c4cb4a7c5b202c83d19d65af0c5c4810a 100644 (file)
--- a/cds/container/impl/ellen_bintree_set.h
+++ b/cds/container/impl/ellen_bintree_set.h
@@ -490,8 +490,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const & key )
         {
             return contains( key );
@@ -511,8 +511,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper< leaf_node, Less, typename maker::value_accessor >());
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/impl/lazy_kvlist.h b/cds/container/impl/lazy_kvlist.h
index 541e8534f33ac305366419d2229825d7bd81fcb2..50762609b54ff61119c0fcfde564ed595646fac1 100644 (file)
--- a/cds/container/impl/lazy_kvlist.h
+++ b/cds/container/impl/lazy_kvlist.h
@@ -454,8 +454,8 @@ namespace cds { namespace container {
             return update_at( head(), key, f, bAllowInsert );
         }
         //@cond
-        // Deprecated
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( const K& key, Func f )
         {
             return update( key, f, true );
@@ -583,8 +583,8 @@ namespace cds { namespace container {
             return find_at( head(), key, intrusive_key_comparator() );
         }
         //@cond
-        // Deprecated
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -604,8 +604,8 @@ namespace cds { namespace container {
             return find_at( head(), key, typename maker::template less_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/impl/lazy_list.h b/cds/container/impl/lazy_list.h
index 50212291363d6036fdf33b9725ba6fb1b7491744..79595829e8a4bfe15fa4f4737b6dfd1b0e60086d 100644 (file)
--- a/cds/container/impl/lazy_list.h
+++ b/cds/container/impl/lazy_list.h
@@ -560,8 +560,8 @@ namespace cds { namespace container {
             return find_at( head(), key, intrusive_key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -581,8 +581,8 @@ namespace cds { namespace container {
             return find_at( head(), key, typename maker::template less_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/impl/michael_kvlist.h b/cds/container/impl/michael_kvlist.h
index dc7d4bbeb11dcb567cfd949b44e991a6ca93a720..9b3a3595150ec15cae7ba00f8dd0257a1195f97e 100644 (file)
--- a/cds/container/impl/michael_kvlist.h
+++ b/cds/container/impl/michael_kvlist.h
@@ -439,8 +439,8 @@ namespace cds { namespace container {
             return update_at( head(), key, f, bAllowInsert );
         }
         //@cond
-        // Deprecated
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func f )
         {
             return update( key, f, true );
@@ -586,8 +586,8 @@ namespace cds { namespace container {
             return find_at( head(), key, intrusive_key_comparator() );
         }
         //@cond
-        // Deprecated
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -607,8 +607,8 @@ namespace cds { namespace container {
             return find_at( head(), key, typename maker::template less_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             CDS_UNUSED( pred );

diff --git a/cds/container/impl/michael_list.h b/cds/container/impl/michael_list.h
index a321d25868ada5f0a17e569b5cd34f9d4fe21605..e530f4c3562fdfffa74fbc36bd97b3067f76a2b3 100644 (file)
--- a/cds/container/impl/michael_list.h
+++ b/cds/container/impl/michael_list.h
@@ -544,8 +544,8 @@ namespace cds { namespace container {
             return find_at( head(), key, intrusive_key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -565,8 +565,8 @@ namespace cds { namespace container {
             return find_at( head(), key, typename maker::template less_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/impl/skip_list_map.h b/cds/container/impl/skip_list_map.h
index 6bfdb2fbe470ade64f6f2afaa85f0887ecab5aac..d48709d7f277886490c3373bba7414e828f8ba62 100644 (file)
--- a/cds/container/impl/skip_list_map.h
+++ b/cds/container/impl/skip_list_map.h
@@ -329,8 +329,8 @@ namespace cds { namespace container {
             return res;
         }
         //@cond
-        // Deprecated, use update()
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func func )
         {
             return update( key, func, true );
@@ -564,8 +564,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( K const& key )
         {
             return contains( key );
@@ -585,8 +585,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper< node_type, Less, typename maker::key_accessor >() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( K const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/impl/skip_list_set.h b/cds/container/impl/skip_list_set.h
index fc907cdd54e22eb6b9183fbcb17dbc8bff1cf079..bdc129797728f629fe2e47f99949763d0e98ad93 100644 (file)
--- a/cds/container/impl/skip_list_set.h
+++ b/cds/container/impl/skip_list_set.h
@@ -287,8 +287,8 @@ namespace cds { namespace container {
             return bRes;
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( const Q& val, Func func )
         {
             return update( val, func, true );
@@ -565,8 +565,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -586,8 +586,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper< node_type, Less, typename maker::value_accessor >());
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/lazy_kvlist_nogc.h b/cds/container/lazy_kvlist_nogc.h
index 0208637d938ddf9d01ed7b9eb35476f3b315664f..4399ee5f314867e19d7873a7139d40c93584f514 100644 (file)
--- a/cds/container/lazy_kvlist_nogc.h
+++ b/cds/container/lazy_kvlist_nogc.h
@@ -392,8 +392,8 @@ namespace cds { namespace container {
             return std::make_pair( node_to_iterator( ret.first ), ret.second );
         }
         //@cond
-        // Deprecated, use update()
         template <typename K>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( const K& key )
         {
             return update( key, true );
@@ -422,8 +422,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, intrusive_key_comparator() ) );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( Q const& key )
         {
             return contains( key );
@@ -443,8 +443,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, typename maker::template less_wrapper<Less>::type() ) );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less, bool Sort = c_bSort>
+        CDS_DEPRECATED("deprecated, use contains()")
         typename std::enable_if<Sort, iterator>::type find_with( Q const& key, Less pred )
         {
             return contains( key, pred );
@@ -463,8 +463,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, typename maker::template equal_to_wrapper<Equal>::type() ) );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Equal, bool Sort = c_bSort>
+        CDS_DEPRECATED("deprecated, use contains()")
         typename std::enable_if<!Sort, iterator>::type find_with( Q const& key, Equal equal )
         {
             return contains( key, equal );

diff --git a/cds/container/lazy_kvlist_rcu.h b/cds/container/lazy_kvlist_rcu.h
index 6eb128508b2e911fea6db3aea6d23b9fe7e24f92..631f0283cc4485e64d5049f048873da3760e78e5 100644 (file)
--- a/cds/container/lazy_kvlist_rcu.h
+++ b/cds/container/lazy_kvlist_rcu.h
@@ -446,8 +446,8 @@ namespace cds { namespace container {
             return update_at( head(), key, func, bAllowInsert );
         }
         //@cond
-        // Deprecated
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( const K& key, Func f )
         {
             return update( key, f, true );
@@ -590,8 +590,8 @@ namespace cds { namespace container {
             return find_at( head(), key, intrusive_key_comparator() );
         }
         //@cond
-        // Deprecated
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key ) const
         {
             return contains( key );
@@ -613,8 +613,8 @@ namespace cds { namespace container {
             return find_at( head(), key, typename maker::template less_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/container/lazy_list_nogc.h b/cds/container/lazy_list_nogc.h
index 5dc5de09a42acc13848ee2924b4a9cb34b9c4f8b..b10ad3536ee91a9353075a32b30b1683c573eea7 100644 (file)
--- a/cds/container/lazy_list_nogc.h
+++ b/cds/container/lazy_list_nogc.h
@@ -313,8 +313,8 @@ namespace cds { namespace container {
             return std::make_pair( node_to_iterator( ret.first ), ret.second );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( Q const& val )
         {
             return update( val, true );
@@ -333,8 +333,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, intrusive_key_comparator() ));
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( Q const& key )
         {
             return contains( key );
@@ -354,8 +354,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, typename maker::template less_wrapper<Less>::type() ));
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less, bool Sort = c_bSort>
+        CDS_DEPRECATED("deprecated, use contains()")
         typename std::enable_if<Sort, iterator>::type find_with( Q const& key, Less pred )
         {
             return contains( key, pred );
@@ -374,8 +374,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, typename maker::template equal_to_wrapper<Equal>::type() ));
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Equal, bool Sort = c_bSort>
+        CDS_DEPRECATED("deprecated, use contains()")
         typename std::enable_if<!Sort, iterator>::type find_with( Q const& key, Equal equal )
         {
             return contains( key, equal );

diff --git a/cds/container/lazy_list_rcu.h b/cds/container/lazy_list_rcu.h
index 91d1284ae91f07403f19941597f4b1bb2779cbc4..3b539e110f80c231663a3de200e03e08ff7c5596 100644 (file)
--- a/cds/container/lazy_list_rcu.h
+++ b/cds/container/lazy_list_rcu.h
@@ -420,8 +420,8 @@ namespace cds { namespace container {
             return update_at( head(), key, func, bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( Q const& key, Func f )
         {
             return update( key, f, true );
@@ -574,8 +574,8 @@ namespace cds { namespace container {
             return find_at( head(), key, intrusive_key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key ) const
         {
             return contains( key );
@@ -595,8 +595,8 @@ namespace cds { namespace container {
             return find_at( head(), key, typename maker::template less_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/container/michael_kvlist_nogc.h b/cds/container/michael_kvlist_nogc.h
index ec55b9c6c0a2e731029110be718682c74e8535e2..a1586e893b0db97de6b1a71dd59a484fa624e489 100644 (file)
--- a/cds/container/michael_kvlist_nogc.h
+++ b/cds/container/michael_kvlist_nogc.h
@@ -408,8 +408,8 @@ namespace cds { namespace container {
             return std::make_pair( node_to_iterator( ret.first ), ret.second );
         }
         //@cond
-        // Deprecated, use update()
         template <typename K>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( K const& key )
         {
             return update( key );
@@ -437,8 +437,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, intrusive_key_comparator() ) );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( Q const& key )
         {
             return contains( key );
@@ -458,8 +458,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, typename maker::template less_wrapper<Less>::type() ) );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/michael_kvlist_rcu.h b/cds/container/michael_kvlist_rcu.h
index dc212d71cb8e58db66ee9d814d14a71d60cb1a85..e1624a0afc90565b23b7b7b7d37f4527147dbedb 100644 (file)
--- a/cds/container/michael_kvlist_rcu.h
+++ b/cds/container/michael_kvlist_rcu.h
@@ -487,8 +487,8 @@ namespace cds { namespace container {
             return update_at( head(), key, func, bAllowInsert );
         }
         //@cond
-        // Deprecated
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( const K& key, Func f )
         {
             return update( key, f, true );
@@ -643,8 +643,8 @@ namespace cds { namespace container {
             return find_at( head(), key, intrusive_key_comparator() );
         }
         //@cond
-        // Deprecated
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -666,8 +666,8 @@ namespace cds { namespace container {
             return find_at( head(), key, typename maker::template less_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/michael_list_nogc.h b/cds/container/michael_list_nogc.h
index a9c94b79cede021a8c9dbef5e27d68e40d332415..b6a48ce0d49f242517f95b754d0a9c1954ac046d 100644 (file)
--- a/cds/container/michael_list_nogc.h
+++ b/cds/container/michael_list_nogc.h
@@ -309,8 +309,8 @@ namespace cds { namespace container {
             return std::make_pair( node_to_iterator( ret.first ), ret.second );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( const Q& val )
         {
             return update( val, true );
@@ -339,8 +339,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, intrusive_key_comparator() ));
         }
         //@cond
-        // Deprecated, ue contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( Q const& key )
         {
             return contains( key );
@@ -360,8 +360,8 @@ namespace cds { namespace container {
             return node_to_iterator( find_at( head(), key, typename maker::template less_wrapper<Less>::type() ) );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/michael_list_rcu.h b/cds/container/michael_list_rcu.h
index 5377e1959c52ad36b58f2d69e9f530a3ef63636f..ee7809b91375241f93089b148a9b57e6c9e4a6de 100644 (file)
--- a/cds/container/michael_list_rcu.h
+++ b/cds/container/michael_list_rcu.h
@@ -425,8 +425,8 @@ namespace cds { namespace container {
             return update_at( head(), key, func, bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( Q const& key, Func f )
         {
             return update( key, f, true );
@@ -589,8 +589,8 @@ namespace cds { namespace container {
             return find_at( head(), key, intrusive_key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );

diff --git a/cds/container/michael_map.h b/cds/container/michael_map.h
index 5079ab736cde60861beea427c5f881462018981a..4af31da7bb913320a006c262a2e458854a97d1b0 100644 (file)
--- a/cds/container/michael_map.h
+++ b/cds/container/michael_map.h
@@ -508,8 +508,8 @@ namespace cds { namespace container {
             return bRet;
         }
         //@cond
-        // Deprecated
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func func )
         {
             std::pair<bool, bool> bRet = bucket( key ).update( key, func, true );
@@ -706,8 +706,8 @@ namespace cds { namespace container {
             return bucket( key ).contains( key );
         }
         //@cond
-        // Deprecated
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( K const& key )
         {
             return bucket( key ).contains( key );
@@ -726,8 +726,8 @@ namespace cds { namespace container {
             return bucket( key ).contains( key, pred );
         }
         //@cond
-        // Deprecated
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( K const& key, Less pred )
         {
             return bucket( key ).contains( key, pred );

diff --git a/cds/container/michael_map_nogc.h b/cds/container/michael_map_nogc.h
index e1be221d59c59641b34c125ee176b8117bcfefe0..2ac3d4499350de40c4aa443c8314aea6307fe5d3 100644 (file)
--- a/cds/container/michael_map_nogc.h
+++ b/cds/container/michael_map_nogc.h
@@ -417,8 +417,8 @@ namespace cds { namespace container {
             return std::make_pair( iterator( ret.first, &refBucket, m_Buckets + bucket_count() ), ret.second );
         }
         //@cond
-        // Deprecated, use update()
         template <typename K>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( K const& key )
         {
             return update( key, true );
@@ -442,8 +442,8 @@ namespace cds { namespace container {
             return end();
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( K const& key )
         {
             return contains( key );
@@ -468,8 +468,8 @@ namespace cds { namespace container {
             return end();
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find_with( K const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/michael_map_rcu.h b/cds/container/michael_map_rcu.h
index a8e8c2fa82b15aac976af49104961fdaf831f454..53097d4936b3adf55aba969a28c5c406ac82f2ae 100644 (file)
--- a/cds/container/michael_map_rcu.h
+++ b/cds/container/michael_map_rcu.h
@@ -439,8 +439,8 @@ namespace cds { namespace container {
             return bRet;
         }
         //@cond
-        // Deprecated
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func func )
         {
             std::pair<bool, bool> bRet = bucket( key ).ensure( key, func );
@@ -656,8 +656,8 @@ namespace cds { namespace container {
             return bucket( key ).contains( key );
         }
         //@cond
-        // Deprecated
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( K const& key )
         {
             return bucket( key ).contains( key );
@@ -676,8 +676,8 @@ namespace cds { namespace container {
             return bucket( key ).contains( key, pred );
         }
         //@cond
-        // Deprecated
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( K const& key, Less pred )
         {
             return bucket( key ).contains( key, pred );

diff --git a/cds/container/skip_list_map_nogc.h b/cds/container/skip_list_map_nogc.h
index 5260b428d82e0e0cc301209a13cfcc051e2b5993..33a41e4ce34639c0560976a6aafbb16af1724e3b 100644 (file)
--- a/cds/container/skip_list_map_nogc.h
+++ b/cds/container/skip_list_map_nogc.h
@@ -247,8 +247,8 @@ namespace cds { namespace container {
             return base_class::update( std::make_pair( key, mapped_type() ), bInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename K>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( K const& key )
         {
             return update( key, true );
@@ -267,8 +267,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond 
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( K const& key )
         {
             return contains( key );
@@ -287,8 +287,8 @@ namespace cds { namespace container {
             return base_class::contains( key, pred );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find_with( K const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/container/skip_list_map_rcu.h b/cds/container/skip_list_map_rcu.h
index 22efe3f48ba9024b650f4b4533e4ee8979e78eed..de2924c8d4e87d311b788ad0d4eb75a294fa7290 100644 (file)
--- a/cds/container/skip_list_map_rcu.h
+++ b/cds/container/skip_list_map_rcu.h
@@ -362,8 +362,8 @@ namespace cds { namespace container {
             return res;
         }
         //@cond
-        // Deprecated, use update()
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func func )
         {
             return update( key, func, true );
@@ -555,8 +555,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( K const& key )
         {
             return contains( key );
@@ -576,8 +576,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper< node_type, Less, typename maker::key_accessor >() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( K const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/skip_list_set_nogc.h b/cds/container/skip_list_set_nogc.h
index ab1100bc176047b13b7b9a6c1b33d5fbfcf490d3..e2df987c7aa78a42d2f05ed663d4a90efad4cbab 100644 (file)
--- a/cds/container/skip_list_set_nogc.h
+++ b/cds/container/skip_list_set_nogc.h
@@ -287,8 +287,8 @@ namespace cds { namespace container {
             return std::make_pair( node_to_iterator( pNode ), bRes.second );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( const Q& val )
         {
             return update( val, true );
@@ -309,8 +309,8 @@ namespace cds { namespace container {
             return base_class::nonconst_end();
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( Q const& key ) const
         {
             return contains( key );
@@ -333,8 +333,8 @@ namespace cds { namespace container {
             return base_class::nonconst_end();
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find_with( Q const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/container/skip_list_set_rcu.h b/cds/container/skip_list_set_rcu.h
index d6347a5c05a8fed5a6cc6995f2551491accd7b19..0739b742981e95df618df2b410e06cd01e898d56 100644 (file)
--- a/cds/container/skip_list_set_rcu.h
+++ b/cds/container/skip_list_set_rcu.h
@@ -364,8 +364,8 @@ namespace cds { namespace container {
             return bRes;
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( const Q& val, Func func )
         {
             return update( val, func, true );
@@ -610,8 +610,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const & key )
         {
             return contains( key );
@@ -631,8 +631,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper< node_type, Less, typename maker::value_accessor >());
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/split_list_map.h b/cds/container/split_list_map.h
index 5c7966a0cb9740687801e2db33b49dda20b910d3..760b9b5bd5206718d523a2c5defeb1c02e030d4f 100644 (file)
--- a/cds/container/split_list_map.h
+++ b/cds/container/split_list_map.h
@@ -345,8 +345,8 @@ namespace cds { namespace container {
                 bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func func )
         {
             return update( key, func, true );
@@ -521,8 +521,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( K const& key )
         {
             return contains( key );
@@ -542,8 +542,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper<value_type, Less, key_accessor>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( K const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/split_list_map_nogc.h b/cds/container/split_list_map_nogc.h
index 4f1276cfbd50fa4a6326e2423da23fd3a4357182..c6708856d0ac83edb459b18ad2a1c2f56cd27a88 100644 (file)
--- a/cds/container/split_list_map_nogc.h
+++ b/cds/container/split_list_map_nogc.h
@@ -240,8 +240,8 @@ namespace cds { namespace container {
             return base_class::update( std::make_pair( key, mapped_type() ), bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename K>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( K const& key )
         {
             return update( key, true );
@@ -259,8 +259,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( K const& key )
         {
             return contains( key );
@@ -280,8 +280,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper<value_type, Less, key_accessor>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find_with( K const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/split_list_map_rcu.h b/cds/container/split_list_map_rcu.h
index a2e41a8c95a547bf0b6aa0aab88eb7ea29527375..552f298f0b58902ac8d6ef1806a8108720561dfb 100644 (file)
--- a/cds/container/split_list_map_rcu.h
+++ b/cds/container/split_list_map_rcu.h
@@ -389,8 +389,8 @@ namespace cds { namespace container {
                 bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename K, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( K const& key, Func func )
         {
             return update( key, func, true );
@@ -572,8 +572,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( K const& key )
         {
             return base_class::find( key );
@@ -593,8 +593,8 @@ namespace cds { namespace container {
             return base_class::contains( key, cds::details::predicate_wrapper<value_type, Less, key_accessor>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename K, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( K const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/split_list_set.h b/cds/container/split_list_set.h
index 4e1e016a5e25fc3a3073f007089d911f67849ac6..7b358b02022355d6e21e3dd748c45dfc3583b900 100644 (file)
--- a/cds/container/split_list_set.h
+++ b/cds/container/split_list_set.h
@@ -473,8 +473,8 @@ namespace cds { namespace container {
             return bRet;
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q, typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( Q const& val, Func func )
         {
             return update( val, func, true );
@@ -674,8 +674,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -695,8 +695,8 @@ namespace cds { namespace container {
             return base_class::contains( key, typename maker::template predicate_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/container/split_list_set_nogc.h b/cds/container/split_list_set_nogc.h
index 89c5acf5ecb174eb3f81694641fcf5c83a681af9..f84cc019c9ae4ca26a675f9aea4905f13daa9553 100644 (file)
--- a/cds/container/split_list_set_nogc.h
+++ b/cds/container/split_list_set_nogc.h
@@ -311,8 +311,8 @@ namespace cds { namespace container {
             return std::make_pair( iterator(ret.first), ret.second );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Q>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<iterator, bool> ensure( const Q& val )
         {
             return update( val, true );
@@ -330,8 +330,8 @@ namespace cds { namespace container {
             return iterator( base_class::find_( key ));
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         iterator find( Q const& key )
         {
             return contains( key );

diff --git a/cds/container/split_list_set_rcu.h b/cds/container/split_list_set_rcu.h
index c353a6e40eb9036e816fc94daf686daacdec79d3..b069cb9ca5ed09bdd0a493f2bb886e02de148f3f 100644 (file)
--- a/cds/container/split_list_set_rcu.h
+++ b/cds/container/split_list_set_rcu.h
@@ -831,8 +831,8 @@ namespace cds { namespace container {
             return base_class::contains( key );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -852,8 +852,8 @@ namespace cds { namespace container {
             return base_class::contains( key, typename maker::template predicate_wrapper<Less>::type() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/cuckoo_set.h b/cds/intrusive/cuckoo_set.h
index 55be5c6d71feb6a02625502d038ba3296f0a490d..f2c12f780c0e7b5a9452ba0e8bc05c55915a26e7 100644 (file)
--- a/cds/intrusive/cuckoo_set.h
+++ b/cds/intrusive/cuckoo_set.h
@@ -2524,8 +2524,8 @@ namespace cds { namespace intrusive {
             return std::make_pair( true, true );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -2698,8 +2698,8 @@ namespace cds { namespace intrusive {
             return find( key, [](value_type&, Q const& ) {} );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -2719,8 +2719,8 @@ namespace cds { namespace intrusive {
             return find_with( key, typename predicate_wrapper<Predicate>::type(), [](value_type& , Q const& ) {} );
         }
         //@cond
-        // Deprecated,use contains()
         template <typename Q, typename Predicate>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Predicate pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/ellen_bintree_rcu.h b/cds/intrusive/ellen_bintree_rcu.h
index c0b8be528c4486395f213ef47ab1e6fc9b5684bb..3588294303147fdd30e3167ab0e047c05dd439fd 100644 (file)
--- a/cds/intrusive/ellen_bintree_rcu.h
+++ b/cds/intrusive/ellen_bintree_rcu.h
@@ -852,8 +852,8 @@ namespace cds { namespace intrusive {
             return std::make_pair( true, true );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -1071,8 +1071,8 @@ namespace cds { namespace intrusive {
             return false;
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key ) const
         {
             return contains( key );
@@ -1108,8 +1108,8 @@ namespace cds { namespace intrusive {
             return false;
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/intrusive/impl/ellen_bintree.h b/cds/intrusive/impl/ellen_bintree.h
index 44f80b1d9aefe3e318bbcbe560b1e0c790861907..61b71367ecd3d517e39ad62bd6720f7aa0c030ae 100644 (file)
--- a/cds/intrusive/impl/ellen_bintree.h
+++ b/cds/intrusive/impl/ellen_bintree.h
@@ -435,8 +435,8 @@ namespace cds { namespace intrusive {
             return std::make_pair( true, true );
         }
         //@cond
-        // Deprecated, us update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -648,8 +648,8 @@ namespace cds { namespace intrusive {
             return false;
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key ) const
         {
             return contains( key );
@@ -682,8 +682,8 @@ namespace cds { namespace intrusive {
             return false;
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/intrusive/impl/lazy_list.h b/cds/intrusive/impl/lazy_list.h
index d8372e84f49d945602867dc29baaab9c94c508bb..103dae8ab084d02f58eb50bce2dc389bcbf41ade 100644 (file)
--- a/cds/intrusive/impl/lazy_list.h
+++ b/cds/intrusive/impl/lazy_list.h
@@ -562,8 +562,8 @@ namespace cds { namespace intrusive {
             return update_at( &m_Head, val, func, bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -761,8 +761,8 @@ namespace cds { namespace intrusive {
             return find_at( &m_Head, key, key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -782,8 +782,8 @@ namespace cds { namespace intrusive {
             return find_at( &m_Head, key, cds::opt::details::make_comparator_from_less<Less>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/impl/michael_list.h b/cds/intrusive/impl/michael_list.h
index 3482bdc1db35f90e95c18c953c457814da698811..c9b01576f1eabac96692842fb7c0390c5aec6abf 100644 (file)
--- a/cds/intrusive/impl/michael_list.h
+++ b/cds/intrusive/impl/michael_list.h
@@ -559,8 +559,8 @@ namespace cds { namespace intrusive {
         }
 
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -762,8 +762,8 @@ namespace cds { namespace intrusive {
             return find_at( m_pHead, key, key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -783,8 +783,8 @@ namespace cds { namespace intrusive {
             return find_at( m_pHead, key, cds::opt::details::make_comparator_from_less<Less>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/impl/skip_list.h b/cds/intrusive/impl/skip_list.h
index d93931199bc782914ec21b6d859df32b71641292..e154675c7e644a75ae8e246f92168ed54ccd0985 100644 (file)
--- a/cds/intrusive/impl/skip_list.h
+++ b/cds/intrusive/impl/skip_list.h
@@ -1154,8 +1154,8 @@ namespace cds { namespace intrusive {
             }
         }
         //@cond
-        // Deprecated, use update() instead
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -1472,8 +1472,8 @@ namespace cds { namespace intrusive {
             return find_with_( key, key_comparator(), [](value_type& , Q const& ) {} );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -1493,8 +1493,8 @@ namespace cds { namespace intrusive {
             return find_with_( key, cds::opt::details::make_comparator_from_less<Less>(), [](value_type& , Q const& ) {} );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/lazy_list_nogc.h b/cds/intrusive/lazy_list_nogc.h
index 6ecb29bfa190206d05c90f22f58d4c39538152d0..e7d38fd12dcd3b9c1691350903f7cc63a21ffdc4 100644 (file)
--- a/cds/intrusive/lazy_list_nogc.h
+++ b/cds/intrusive/lazy_list_nogc.h
@@ -376,8 +376,8 @@ namespace cds { namespace intrusive {
             return update_at( &m_Head, val, func, bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -467,8 +467,8 @@ namespace cds { namespace intrusive {
             return find_at( &m_Head, key, key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         value_type * find( Q const& key )
         {
             return contains( key );
@@ -488,8 +488,8 @@ namespace cds { namespace intrusive {
             return find_at( &m_Head, key, cds::opt::details::make_comparator_from_less<Less>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less, bool Sort = c_bSort>
+        CDS_DEPRECATED("deprecated, use contains()")
         typename std::enable_if<Sort, value_type *>::type find_with( Q const& key, Less pred )
         {
             return contains( key, pred );
@@ -507,8 +507,8 @@ namespace cds { namespace intrusive {
             return find_at( &m_Head, key, equal );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Equal, bool Sort = c_bSort>
+        CDS_DEPRECATED("deprecated, use contains()")
         typename std::enable_if<!Sort, value_type *>::type find_with( Q const& key, Equal equal )
         {
             return contains( key, equal );

diff --git a/cds/intrusive/lazy_list_rcu.h b/cds/intrusive/lazy_list_rcu.h
index 12486644e663677e37e351c6a1e82ad4dfdb8000..b37e606126adb85e3f392e759e6405ecf9b3b356 100644 (file)
--- a/cds/intrusive/lazy_list_rcu.h
+++ b/cds/intrusive/lazy_list_rcu.h
@@ -488,8 +488,8 @@ namespace cds { namespace intrusive {
             return update_at( &m_Head, val, func, bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -716,8 +716,8 @@ namespace cds { namespace intrusive {
             return find_at( const_cast<node_type *>( &m_Head ), key, key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key ) const
         {
             return contains( key );
@@ -737,8 +737,8 @@ namespace cds { namespace intrusive {
             return find_at( const_cast<node_type *>( &m_Head ), key, cds::opt::details::make_comparator_from_less<Less>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/intrusive/michael_list_nogc.h b/cds/intrusive/michael_list_nogc.h
index c1fec7c167976de404db6a8a17b8aed4f02ff824..0bb2867da583f60b5b2e83379e56a924cdb842f5 100644 (file)
--- a/cds/intrusive/michael_list_nogc.h
+++ b/cds/intrusive/michael_list_nogc.h
@@ -332,8 +332,8 @@ namespace cds { namespace intrusive {
             return update_at( m_pHead, val, func, bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func );
@@ -404,8 +404,8 @@ namespace cds { namespace intrusive {
             return find_at( m_pHead, key, key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         value_type * find( Q const& key )
         {
             return contains( key );
@@ -425,8 +425,8 @@ namespace cds { namespace intrusive {
             return find_at( m_pHead, key, cds::opt::details::make_comparator_from_less<Less>());
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         value_type * find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/michael_list_rcu.h b/cds/intrusive/michael_list_rcu.h
index 71f0b1d35d5c004b10a95dc30bea1d952b59861b..4fd6f839c914fa291e1d3943c199387f0fa4706c 100644 (file)
--- a/cds/intrusive/michael_list_rcu.h
+++ b/cds/intrusive/michael_list_rcu.h
@@ -484,8 +484,8 @@ namespace cds { namespace intrusive {
             return update_at( m_pHead, val, func, bAllowInsert );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -712,8 +712,8 @@ namespace cds { namespace intrusive {
             return find_at( m_pHead, key, key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -733,8 +733,8 @@ namespace cds { namespace intrusive {
             return find_at( m_pHead, key, cds::opt::details::make_comparator_from_less<Less>() );
         }
         //@cond
-        // Deprecated
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/skip_list_nogc.h b/cds/intrusive/skip_list_nogc.h
index dbb941a49c1324e48f7f773ee7b7740eeff4f2ef..b00fb3a00594a65fe5fb6590d0a96f87e5fff392 100644 (file)
--- a/cds/intrusive/skip_list_nogc.h
+++ b/cds/intrusive/skip_list_nogc.h
@@ -754,8 +754,8 @@ namespace cds { namespace intrusive {
             }
         }
         //@cond
-        // Deprecated, use update() instead
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -835,8 +835,8 @@ namespace cds { namespace intrusive {
             return nullptr;
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         value_type * find( Q const& key ) const
         {
             return contains( key );
@@ -859,8 +859,8 @@ namespace cds { namespace intrusive {
             return nullptr;
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         value_type * find_with( Q const& key, Less pred ) const
         {
             return contains( key, pred );

diff --git a/cds/intrusive/skip_list_rcu.h b/cds/intrusive/skip_list_rcu.h
index 42ee12f3e4d54234713129ddca1f53f121e8134e..57d420adeec52792867b329d062a6d861237fae1 100644 (file)
--- a/cds/intrusive/skip_list_rcu.h
+++ b/cds/intrusive/skip_list_rcu.h
@@ -1528,8 +1528,8 @@ namespace cds { namespace intrusive {
             return bRet;
         }
         //@cond
-        // Deprecated, use update().
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -1844,8 +1844,8 @@ namespace cds { namespace intrusive {
             return do_find_with( key, key_comparator(), [](value_type& , Q const& ) {} );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -1865,8 +1865,8 @@ namespace cds { namespace intrusive {
             return do_find_with( key, cds::opt::details::make_comparator_from_less<Less>(), [](value_type& , Q const& ) {} );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/split_list.h b/cds/intrusive/split_list.h
index a92e004ec8bf6911b98077d21f0cee2a10c0e6c3..8f3853d8bbcc20338cc18b4f000b01f80afe9885 100644 (file)
--- a/cds/intrusive/split_list.h
+++ b/cds/intrusive/split_list.h
@@ -730,8 +730,8 @@ namespace cds { namespace intrusive {
             return bRet;
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -960,8 +960,8 @@ namespace cds { namespace intrusive {
             return find_( key, key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -981,8 +981,8 @@ namespace cds { namespace intrusive {
             return find_( key, typename wrapped_ordered_list::template make_compare_from_less<Less>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/split_list_nogc.h b/cds/intrusive/split_list_nogc.h
index b4fdd655043f4794d0a1e2890b64940a3be7b251..eb0a7e8c9f40adb17a28f46b41cf1284cd5675fb 100644 (file)
--- a/cds/intrusive/split_list_nogc.h
+++ b/cds/intrusive/split_list_nogc.h
@@ -355,8 +355,8 @@ namespace cds { namespace intrusive {
             return std::make_pair( ret.first != end(), ret.second );
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -381,8 +381,8 @@ namespace cds { namespace intrusive {
             return &*it;
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         value_type * find( Q const& key )
         {
             return contains( key );
@@ -404,8 +404,8 @@ namespace cds { namespace intrusive {
             return &*it;
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         value_type * find_with( Q const& key, Less pred )
         {
             return contains( key, pred );

diff --git a/cds/intrusive/split_list_rcu.h b/cds/intrusive/split_list_rcu.h
index cd9415c600d001eb8ca8f0ce8d77d99c44f019c6..ffbfff3ac88f1a5d8f2962a92e3e7ad67cbcf3f9 100644 (file)
--- a/cds/intrusive/split_list_rcu.h
+++ b/cds/intrusive/split_list_rcu.h
@@ -615,8 +615,8 @@ namespace cds { namespace intrusive {
             return bRet;
         }
         //@cond
-        // Deprecated, use update()
         template <typename Func>
+        CDS_DEPRECATED("ensure() is deprecated, use update()")
         std::pair<bool, bool> ensure( value_type& val, Func func )
         {
             return update( val, func, true );
@@ -858,8 +858,8 @@ namespace cds { namespace intrusive {
             return find_value( key, key_comparator() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find( Q const& key )
         {
             return contains( key );
@@ -879,8 +879,8 @@ namespace cds { namespace intrusive {
             return find_value( key, typename wrapped_ordered_list::template make_compare_from_less<Less>() );
         }
         //@cond
-        // Deprecated, use contains()
         template <typename Q, typename Less>
+        CDS_DEPRECATED("deprecated, use contains()")
         bool find_with( Q const& key, Less pred )
         {
             return contains( key, pred );