boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-31 03:47:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add deprecated attributes to deprecated functions

Browse Source
This commit is contained in:
Daniel James
2017-04-15 17:35:09 +01:00
parent 2bfc59c461
commit ed8c0f9ecd
5 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/changes.qbk
View File

@ -312,4 +312,9 @@ C++11 support has resulted in some breaking changes:
`unordered_multiset` yet. That will hopefully be in the next version of `unordered_multiset` yet. That will hopefully be in the next version of
Boost. Boost.
[h2 Boost 1.65.0]
* Add deprecated attributes to `quick_erase` and `erase_return_void`.
Will fully remove in a future version.
[endsect] [endsect]

27
include/boost/unordered/detail/implementation.hpp
View File

@ -104,6 +104,33 @@
#define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 0 #define BOOST_UNORDERED_USE_ALLOCATOR_TRAITS 0
#endif #endif
//
// Other configuration macros
//
#if defined(BOOST_UNORDERED_SUPPRESS_DEPRECATED)
#define BOOST_UNORDERED_DEPRECATED(msg)
#endif
#if defined(__has_cpp_attribute) && \
(!defined(BOOST_GCC) || defined(BOOST_GCC_CXX11))
#if __has_cpp_attribute(deprecated) && !defined(BOOST_UNORDERED_DEPRECATED)
#define BOOST_UNORDERED_DEPRECATED(msg) [[deprecated(msg)]]
#endif
#endif
#if !defined(BOOST_UNORDERED_DEPRECATED)
#if defined(__GNUC__) && __GNUC__ >= 4
#define BOOST_UNORDERED_DEPRECATED(msg) __attribute__((deprecated))
#elif defined(_MSC_VER) && _MSC_VER >= 1400
#define BOOST_UNORDERED_DEPRECATED(msg) __declspec(deprecated(msg))
#elif defined(_MSC_VER) && _MSC_VER >= 1310
#define BOOST_UNORDERED_DEPRECATED(msg) __declspec(deprecated)
#else
#define BOOST_UNORDERED_DEPRECATED(msg)
#endif
#endif
namespace boost { namespace boost {
namespace unordered { namespace unordered {
namespace iterator_detail { namespace iterator_detail {

4
include/boost/unordered/unordered_map.hpp
View File

@ -635,7 +635,9 @@ template <class K, class T, class H, class P, class A> class unordered_map
iterator erase(const_iterator); iterator erase(const_iterator);
size_type erase(const key_type&); size_type erase(const key_type&);
iterator erase(const_iterator, const_iterator); iterator erase(const_iterator, const_iterator);
BOOST_UNORDERED_DEPRECATED("Use erase instead")
void quick_erase(const_iterator it) { erase(it); } void quick_erase(const_iterator it) { erase(it); }
BOOST_UNORDERED_DEPRECATED("Use erase instead")
void erase_return_void(const_iterator it) { erase(it); } void erase_return_void(const_iterator it) { erase(it); }
void clear(); void clear();
@ -1112,7 +1114,9 @@ template <class K, class T, class H, class P, class A> class unordered_multimap
iterator erase(const_iterator); iterator erase(const_iterator);
size_type erase(const key_type&); size_type erase(const key_type&);
iterator erase(const_iterator, const_iterator); iterator erase(const_iterator, const_iterator);
BOOST_UNORDERED_DEPRECATED("Use erase instead")
void quick_erase(const_iterator it) { erase(it); } void quick_erase(const_iterator it) { erase(it); }
BOOST_UNORDERED_DEPRECATED("Use erase instead")
void erase_return_void(const_iterator it) { erase(it); } void erase_return_void(const_iterator it) { erase(it); }
void clear(); void clear();

4
include/boost/unordered/unordered_set.hpp
View File

@ -388,7 +388,9 @@ template <class T, class H, class P, class A> class unordered_set
iterator erase(const_iterator); iterator erase(const_iterator);
size_type erase(const key_type&); size_type erase(const key_type&);
iterator erase(const_iterator, const_iterator); iterator erase(const_iterator, const_iterator);
BOOST_UNORDERED_DEPRECATED("Use erase instead")
void quick_erase(const_iterator it) { erase(it); } void quick_erase(const_iterator it) { erase(it); }
BOOST_UNORDERED_DEPRECATED("Use erase instead")
void erase_return_void(const_iterator it) { erase(it); } void erase_return_void(const_iterator it) { erase(it); }
void clear(); void clear();
@ -835,7 +837,9 @@ template <class T, class H, class P, class A> class unordered_multiset
iterator erase(const_iterator); iterator erase(const_iterator);
size_type erase(const key_type&); size_type erase(const key_type&);
iterator erase(const_iterator, const_iterator); iterator erase(const_iterator, const_iterator);
BOOST_UNORDERED_DEPRECATED("Use erase instead")
void quick_erase(const_iterator it) { erase(it); } void quick_erase(const_iterator it) { erase(it); }
BOOST_UNORDERED_DEPRECATED("Use erase instead")
void erase_return_void(const_iterator it) { erase(it); } void erase_return_void(const_iterator it) { erase(it); }
void clear(); void clear();

2
test/Jamfile.v2
View File

@ -45,7 +45,7 @@ test-suite unordered
[ run unordered/insert_hint_tests.cpp ] [ run unordered/insert_hint_tests.cpp ]
[ run unordered/emplace_tests.cpp ] [ run unordered/emplace_tests.cpp ]
[ run unordered/unnecessary_copy_tests.cpp ] [ run unordered/unnecessary_copy_tests.cpp ]
[ run unordered/erase_tests.cpp ] [ run unordered/erase_tests.cpp : : : <define>BOOST_UNORDERED_SUPPRESS_DEPRECATED ]
[ run unordered/erase_equiv_tests.cpp ] [ run unordered/erase_equiv_tests.cpp ]
[ run unordered/extract_tests.cpp ] [ run unordered/extract_tests.cpp ]
[ run unordered/node_handle_tests.cpp ] [ run unordered/node_handle_tests.cpp ]