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

Remove usage of deprecated macros

Browse Source 
[SVN r81449]
This commit is contained in:
Marshall Clow
2012-11-21 01:21:54 +00:00
parent 8fb85cbb8d
commit 85d2657ac1
7 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/unordered/detail/allocate.hpp
View File

@ -85,7 +85,7 @@ namespace boost { namespace unordered { namespace detail {
// Either forwarding variadic arguments, or storing the arguments in // Either forwarding variadic arguments, or storing the arguments in
// emplace_args##n // emplace_args##n
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
#define BOOST_UNORDERED_EMPLACE_TEMPLATE typename... Args #define BOOST_UNORDERED_EMPLACE_TEMPLATE typename... Args
#define BOOST_UNORDERED_EMPLACE_ARGS BOOST_FWD_REF(Args)... args #define BOOST_UNORDERED_EMPLACE_ARGS BOOST_FWD_REF(Args)... args
@ -136,7 +136,7 @@ namespace boost { namespace unordered { namespace detail {
#define BOOST_UNORDERED_EMPLACE_ARGS2 create_emplace_args #define BOOST_UNORDERED_EMPLACE_ARGS2 create_emplace_args
#define BOOST_UNORDERED_EMPLACE_ARGS3 create_emplace_args #define BOOST_UNORDERED_EMPLACE_ARGS3 create_emplace_args
#if defined(BOOST_NO_RVALUE_REFERENCES) #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
#define BOOST_UNORDERED_EARGS_MEMBER(z, n, _) \ #define BOOST_UNORDERED_EARGS_MEMBER(z, n, _) \
typedef BOOST_FWD_REF(BOOST_PP_CAT(A, n)) BOOST_PP_CAT(Arg, n); \ typedef BOOST_FWD_REF(BOOST_PP_CAT(A, n)) BOOST_PP_CAT(Arg, n); \
@ -342,7 +342,7 @@ namespace boost { namespace unordered { namespace detail {
# include <boost/type_traits/is_same.hpp> # include <boost/type_traits/is_same.hpp>
# endif # endif
# if !defined(BOOST_NO_VARIADIC_TEMPLATES) && \ # if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && \
!defined(BOOST_NO_SFINAE_EXPR) !defined(BOOST_NO_SFINAE_EXPR)
# define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 1 # define BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT 1
# else # else
@ -432,7 +432,7 @@ namespace boost { namespace unordered { namespace detail {
max_size, U const, (), 0 max_size, U const, (), 0
); );
# if !defined(BOOST_NO_VARIADIC_TEMPLATES) # if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <typename T, typename ValueType, typename... Args> template <typename T, typename ValueType, typename... Args>
BOOST_UNORDERED_HAS_FUNCTION( BOOST_UNORDERED_HAS_FUNCTION(
@ -763,7 +763,7 @@ namespace boost { namespace unordered { namespace detail {
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// call_construct // call_construct
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
# if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT # if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
@ -812,7 +812,7 @@ namespace boost { namespace unordered { namespace detail {
// //
// Used for piecewise construction. // Used for piecewise construction.
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
# define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(n, namespace_) \ # define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(n, namespace_) \
template<typename Alloc, typename T> \ template<typename Alloc, typename T> \
@ -934,7 +934,7 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost::)
sizeof(test(choose(), boost::unordered::detail::make<A0>())) }; sizeof(test(choose(), boost::unordered::detail::make<A0>())) };
}; };
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Construct from variadic parameters // Construct from variadic parameters
@ -966,7 +966,7 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost::)
boost::addressof(address->second), boost::forward<A2>(a2)); boost::addressof(address->second), boost::forward<A2>(a2));
} }
#else // BOOST_NO_VARIADIC_TEMPLATES #else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Construct from emplace_args // Construct from emplace_args
@ -1038,7 +1038,7 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost::)
boost::addressof(address->second), args.a2); boost::addressof(address->second), args.a2);
} }
#endif // BOOST_NO_VARIADIC_TEMPLATES #endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
}}} }}}

2
include/boost/unordered/detail/buckets.hpp
View File

@ -777,7 +777,7 @@ namespace boost { namespace unordered { namespace detail {
// rvalue parameters when type can't be a BOOST_RV_REF(T) parameter // rvalue parameters when type can't be a BOOST_RV_REF(T) parameter
// e.g. for int // e.g. for int
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
# define BOOST_UNORDERED_RV_REF(T) BOOST_RV_REF(T) # define BOOST_UNORDERED_RV_REF(T) BOOST_RV_REF(T)
#else #else
struct please_ignore_this_overload { struct please_ignore_this_overload {

4
include/boost/unordered/detail/equivalent.hpp
View File

@ -438,8 +438,8 @@ namespace boost { namespace unordered { namespace detail {
this->add_node(a, key_hash, this->find_node(key_hash, k)); this->add_node(a, key_hash, this->find_node(key_hash, k));
} }
#if defined(BOOST_NO_RVALUE_REFERENCES) #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
# if defined(BOOST_NO_VARIADIC_TEMPLATES) # if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
iterator emplace(boost::unordered::detail::emplace_args1< iterator emplace(boost::unordered::detail::emplace_args1<
boost::unordered::detail::please_ignore_this_overload> const&) boost::unordered::detail::please_ignore_this_overload> const&)
{ {

6
include/boost/unordered/detail/extract_key.hpp
View File

@ -56,7 +56,7 @@ namespace detail {
return no_key(); return no_key();
} }
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args> template <class... Args>
static no_key extract(Args const&...) static no_key extract(Args const&...)
{ {
@ -107,7 +107,7 @@ namespace detail {
return k; return k;
} }
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args> template <class... Args>
static no_key extract(Args const&...) static no_key extract(Args const&...)
{ {
@ -133,7 +133,7 @@ namespace detail {
} }
#endif #endif
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
#define BOOST_UNORDERED_KEY_FROM_TUPLE(namespace_) \ #define BOOST_UNORDERED_KEY_FROM_TUPLE(namespace_) \
template <typename T2> \ template <typename T2> \

8
include/boost/unordered/detail/unique.hpp
View File

@ -353,8 +353,8 @@ namespace boost { namespace unordered { namespace detail {
return *add_node(a, key_hash); return *add_node(a, key_hash);
} }
#if defined(BOOST_NO_RVALUE_REFERENCES) #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
# if defined(BOOST_NO_VARIADIC_TEMPLATES) # if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
emplace_return emplace(boost::unordered::detail::emplace_args1< emplace_return emplace(boost::unordered::detail::emplace_args1<
boost::unordered::detail::please_ignore_this_overload> const&) boost::unordered::detail::please_ignore_this_overload> const&)
{ {
@ -374,7 +374,7 @@ namespace boost { namespace unordered { namespace detail {
template <BOOST_UNORDERED_EMPLACE_TEMPLATE> template <BOOST_UNORDERED_EMPLACE_TEMPLATE>
emplace_return emplace(BOOST_UNORDERED_EMPLACE_ARGS) emplace_return emplace(BOOST_UNORDERED_EMPLACE_ARGS)
{ {
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
return emplace_impl( return emplace_impl(
extractor::extract(BOOST_UNORDERED_EMPLACE_FORWARD), extractor::extract(BOOST_UNORDERED_EMPLACE_FORWARD),
BOOST_UNORDERED_EMPLACE_FORWARD); BOOST_UNORDERED_EMPLACE_FORWARD);
@ -385,7 +385,7 @@ namespace boost { namespace unordered { namespace detail {
#endif #endif
} }
#if defined(BOOST_NO_VARIADIC_TEMPLATES) #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <typename A0> template <typename A0>
emplace_return emplace( emplace_return emplace(
boost::unordered::detail::emplace_args1<A0> const& args) boost::unordered::detail::emplace_args1<A0> const& args)

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

@ -120,14 +120,14 @@ namespace unordered
: table_(other.table_, boost::unordered::detail::move_tag()) : table_(other.table_, boost::unordered::detail::move_tag())
{ {
} }
#elif !defined(BOOST_NO_RVALUE_REFERENCES) #elif !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_map(unordered_map&& other) unordered_map(unordered_map&& other)
: table_(other.table_, boost::unordered::detail::move_tag()) : table_(other.table_, boost::unordered::detail::move_tag())
{ {
} }
#endif #endif
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_map(unordered_map&&, allocator_type const&); unordered_map(unordered_map&&, allocator_type const&);
#endif #endif
@ -165,7 +165,7 @@ namespace unordered
return *this; return *this;
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_map& operator=(unordered_map&& x) unordered_map& operator=(unordered_map&& x)
{ {
table_.move_assign(x.table_); table_.move_assign(x.table_);
@ -231,7 +231,7 @@ namespace unordered
// emplace // emplace
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args> template <class... Args>
std::pair<iterator, bool> emplace(BOOST_FWD_REF(Args)... args) std::pair<iterator, bool> emplace(BOOST_FWD_REF(Args)... args)
{ {
@ -601,14 +601,14 @@ namespace unordered
: table_(other.table_, boost::unordered::detail::move_tag()) : table_(other.table_, boost::unordered::detail::move_tag())
{ {
} }
#elif !defined(BOOST_NO_RVALUE_REFERENCES) #elif !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_multimap(unordered_multimap&& other) unordered_multimap(unordered_multimap&& other)
: table_(other.table_, boost::unordered::detail::move_tag()) : table_(other.table_, boost::unordered::detail::move_tag())
{ {
} }
#endif #endif
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_multimap(unordered_multimap&&, allocator_type const&); unordered_multimap(unordered_multimap&&, allocator_type const&);
#endif #endif
@ -647,7 +647,7 @@ namespace unordered
return *this; return *this;
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_multimap& operator=(unordered_multimap&& x) unordered_multimap& operator=(unordered_multimap&& x)
{ {
table_.move_assign(x.table_); table_.move_assign(x.table_);
@ -713,7 +713,7 @@ namespace unordered
// emplace // emplace
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args> template <class... Args>
iterator emplace(BOOST_FWD_REF(Args)... args) iterator emplace(BOOST_FWD_REF(Args)... args)
{ {
@ -1066,7 +1066,7 @@ namespace unordered
{ {
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template <class K, class T, class H, class P, class A> template <class K, class T, class H, class P, class A>
unordered_map<K,T,H,P,A>::unordered_map( unordered_map<K,T,H,P,A>::unordered_map(
@ -1399,7 +1399,7 @@ namespace unordered
{ {
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template <class K, class T, class H, class P, class A> template <class K, class T, class H, class P, class A>
unordered_multimap<K,T,H,P,A>::unordered_multimap( unordered_multimap<K,T,H,P,A>::unordered_multimap(

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

@ -118,14 +118,14 @@ namespace unordered
: table_(other.table_, boost::unordered::detail::move_tag()) : table_(other.table_, boost::unordered::detail::move_tag())
{ {
} }
#elif !defined(BOOST_NO_RVALUE_REFERENCES) #elif !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_set(unordered_set&& other) unordered_set(unordered_set&& other)
: table_(other.table_, boost::unordered::detail::move_tag()) : table_(other.table_, boost::unordered::detail::move_tag())
{ {
} }
#endif #endif
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_set(unordered_set&&, allocator_type const&); unordered_set(unordered_set&&, allocator_type const&);
#endif #endif
@ -163,7 +163,7 @@ namespace unordered
return *this; return *this;
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_set& operator=(unordered_set&& x) unordered_set& operator=(unordered_set&& x)
{ {
table_.move_assign(x.table_); table_.move_assign(x.table_);
@ -229,7 +229,7 @@ namespace unordered
// emplace // emplace
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args> template <class... Args>
std::pair<iterator, bool> emplace(BOOST_FWD_REF(Args)... args) std::pair<iterator, bool> emplace(BOOST_FWD_REF(Args)... args)
{ {
@ -585,14 +585,14 @@ namespace unordered
: table_(other.table_, boost::unordered::detail::move_tag()) : table_(other.table_, boost::unordered::detail::move_tag())
{ {
} }
#elif !defined(BOOST_NO_RVALUE_REFERENCES) #elif !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_multiset(unordered_multiset&& other) unordered_multiset(unordered_multiset&& other)
: table_(other.table_, boost::unordered::detail::move_tag()) : table_(other.table_, boost::unordered::detail::move_tag())
{ {
} }
#endif #endif
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_multiset(unordered_multiset&&, allocator_type const&); unordered_multiset(unordered_multiset&&, allocator_type const&);
#endif #endif
@ -631,7 +631,7 @@ namespace unordered
return *this; return *this;
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
unordered_multiset& operator=(unordered_multiset&& x) unordered_multiset& operator=(unordered_multiset&& x)
{ {
table_.move_assign(x.table_); table_.move_assign(x.table_);
@ -697,7 +697,7 @@ namespace unordered
// emplace // emplace
#if !defined(BOOST_NO_VARIADIC_TEMPLATES) #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <class... Args> template <class... Args>
iterator emplace(BOOST_FWD_REF(Args)... args) iterator emplace(BOOST_FWD_REF(Args)... args)
{ {
@ -1041,7 +1041,7 @@ namespace unordered
{ {
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template <class T, class H, class P, class A> template <class T, class H, class P, class A>
unordered_set<T,H,P,A>::unordered_set( unordered_set<T,H,P,A>::unordered_set(
@ -1325,7 +1325,7 @@ namespace unordered
{ {
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template <class T, class H, class P, class A> template <class T, class H, class P, class A>
unordered_multiset<T,H,P,A>::unordered_multiset( unordered_multiset<T,H,P,A>::unordered_multiset(