feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Unordered: Use Boost.Move for variadic forwarding.

Browse Source 
[SVN r76331]
This commit is contained in:
Daniel James
2012-01-06 08:36:43 +00:00
parent d70fcb8c25
commit 2665090568
10 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
include/boost/unordered/detail/emplace_args.hpp
View File

@ -40,20 +40,7 @@
#if !defined(BOOST_NO_RVALUE_REFERENCES) && \ #if !defined(BOOST_NO_RVALUE_REFERENCES) && \
!defined(BOOST_NO_VARIADIC_TEMPLATES) !defined(BOOST_NO_VARIADIC_TEMPLATES)
# if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION) #define BOOST_UNORDERED_VARIADIC_MOVE
# elif defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER)
# elif defined(_LIBCPP_VERSION)
# define BOOST_UNORDERED_STD_FORWARD_MOVE
# elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
# if defined(__GLIBCXX__) && __GLIBCXX__ >= 20090804
# define BOOST_UNORDERED_STD_FORWARD_MOVE
# endif
# elif defined(__STL_CONFIG_H)
# elif defined(__MSL_CPP__)
# elif defined(__IBMCPP__)
# elif defined(MSIPL_COMPILE_H)
# elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
# endif
#endif #endif
namespace boost { namespace unordered { namespace detail { namespace boost { namespace unordered { namespace detail {
@ -64,11 +51,11 @@ 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_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
#define BOOST_UNORDERED_EMPLACE_TEMPLATE typename... Args #define BOOST_UNORDERED_EMPLACE_TEMPLATE typename... Args
#define BOOST_UNORDERED_EMPLACE_ARGS Args&&... args #define BOOST_UNORDERED_EMPLACE_ARGS Args&&... args
#define BOOST_UNORDERED_EMPLACE_FORWARD std::forward<Args>(args)... #define BOOST_UNORDERED_EMPLACE_FORWARD boost::forward<Args>(args)...
#else #else
@ -302,7 +289,7 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
#endif #endif
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Construct from variadic parameters // Construct from variadic parameters
@ -310,7 +297,7 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
template <typename T, typename... Args> template <typename T, typename... Args>
inline void construct_impl(T* address, Args&&... args) inline void construct_impl(T* address, Args&&... args)
{ {
new((void*) address) T(std::forward<Args>(args)...); new((void*) address) T(boost::forward<Args>(args)...);
} }
template <typename A, typename B, typename A0, typename A1, typename A2> template <typename A, typename B, typename A0, typename A1, typename A2>
@ -329,7 +316,7 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
inline typename enable_if<emulation1<A, B, A0>, void>::type inline typename enable_if<emulation1<A, B, A0>, void>::type
construct_impl(std::pair<A, B>* address, A0&& a0) construct_impl(std::pair<A, B>* address, A0&& a0)
{ {
new((void*) boost::addressof(address->first)) A(std::forward<A0>(a0)); new((void*) boost::addressof(address->first)) A(boost::forward<A0>(a0));
new((void*) boost::addressof(address->second)) B(); new((void*) boost::addressof(address->second)) B();
} }
@ -337,10 +324,10 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
inline typename enable_if<emulation3<A, B, A0>, void>::type inline typename enable_if<emulation3<A, B, A0>, void>::type
construct_impl(std::pair<A, B>* address, A0&& a0, A1&& a1, A2&& a2) construct_impl(std::pair<A, B>* address, A0&& a0, A1&& a1, A2&& a2)
{ {
new((void*) boost::addressof(address->first)) A(std::forward<A0>(a0)); new((void*) boost::addressof(address->first)) A(boost::forward<A0>(a0));
new((void*) boost::addressof(address->second)) B( new((void*) boost::addressof(address->second)) B(
std::forward<A1>(a1), boost::forward<A1>(a1),
std::forward<A2>(a2)); boost::forward<A2>(a2));
} }
template <typename A, typename B, template <typename A, typename B,
@ -349,17 +336,17 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
inline void construct_impl(std::pair<A, B>* address, inline void construct_impl(std::pair<A, B>* address,
A0&& a0, A1&& a1, A2&& a2, A3&& a3, Args&&... args) A0&& a0, A1&& a1, A2&& a2, A3&& a3, Args&&... args)
{ {
new((void*) boost::addressof(address->first)) A(std::forward<A0>(a0)); new((void*) boost::addressof(address->first)) A(boost::forward<A0>(a0));
new((void*) boost::addressof(address->second)) B( new((void*) boost::addressof(address->second)) B(
std::forward<A1>(a1), boost::forward<A1>(a1),
std::forward<A2>(a2), boost::forward<A2>(a2),
std::forward<A3>(a3), boost::forward<A3>(a3),
std::forward<Args>(args)...); boost::forward<Args>(args)...);
} }
#endif // BOOST_UNORDERED_DEPRECATED_PAIR_CONSTRUCT #endif // BOOST_UNORDERED_DEPRECATED_PAIR_CONSTRUCT
#else // BOOST_UNORDERED_STD_FORWARD_MOVE #else // BOOST_UNORDERED_VARIADIC_MOVE
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Construct from emplace_args // Construct from emplace_args
@ -471,7 +458,7 @@ BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
#undef BOOST_UNORDERED_CALL_FORWARD2 #undef BOOST_UNORDERED_CALL_FORWARD2
#endif // BOOST_UNORDERED_DEPRECATED_PAIR_CONSTRUCT #endif // BOOST_UNORDERED_DEPRECATED_PAIR_CONSTRUCT
#endif // BOOST_UNORDERED_STD_FORWARD_MOVE #endif // BOOST_UNORDERED_VARIADIC_MOVE
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// Construct without using the emplace args mechanism. // Construct without using the emplace args mechanism.

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

@ -63,7 +63,7 @@ namespace detail {
return no_key(); return no_key();
} }
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class... Args> template <class... Args>
static no_key extract(Args const&...) static no_key extract(Args const&...)
{ {
@ -126,7 +126,7 @@ namespace detail {
return v.first; return v.first;
} }
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class Arg1, class... Args> template <class Arg1, class... Args>
static key_type const& extract(key_type const& k, static key_type const& extract(key_type const& k,
Arg1 const&, Args const&...) Arg1 const&, Args const&...)
@ -165,7 +165,7 @@ namespace detail {
} }
#endif #endif
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
#define BOOST_UNORDERED_KEY_FROM_TUPLE(namespace_) \ #define BOOST_UNORDERED_KEY_FROM_TUPLE(namespace_) \
template <typename T2> \ template <typename T2> \

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

@ -337,7 +337,7 @@ namespace boost { namespace unordered { namespace detail {
// exception (need strong safety in such a case). // exception (need strong safety in such a case).
node_constructor a(this->node_alloc()); node_constructor a(this->node_alloc());
a.construct_node(); a.construct_node();
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
a.construct_value(boost::unordered::piecewise_construct, a.construct_value(boost::unordered::piecewise_construct,
boost::make_tuple(k), boost::make_tuple()); boost::make_tuple(k), boost::make_tuple());
#else #else
@ -364,7 +364,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_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
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);
@ -376,7 +376,7 @@ namespace boost { namespace unordered { namespace detail {
#endif #endif
} }
#if !defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if !defined(BOOST_UNORDERED_VARIADIC_MOVE)
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)

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

@ -233,17 +233,17 @@ namespace unordered
// emplace // emplace
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class... Args> template <class... Args>
std::pair<iterator, bool> emplace(Args&&... args) std::pair<iterator, bool> emplace(Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...); return table_.emplace(boost::forward<Args>(args)...);
} }
template <class... Args> template <class... Args>
iterator emplace_hint(const_iterator, Args&&... args) iterator emplace_hint(const_iterator, Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...).first; return table_.emplace(boost::forward<Args>(args)...).first;
} }
#else #else
@ -718,17 +718,17 @@ namespace unordered
// emplace // emplace
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class... Args> template <class... Args>
iterator emplace(Args&&... args) iterator emplace(Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...); return table_.emplace(boost::forward<Args>(args)...);
} }
template <class... Args> template <class... Args>
iterator emplace_hint(const_iterator, Args&&... args) iterator emplace_hint(const_iterator, Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...); return table_.emplace(boost::forward<Args>(args)...);
} }
#else #else

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

@ -231,17 +231,17 @@ namespace unordered
// emplace // emplace
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class... Args> template <class... Args>
std::pair<iterator, bool> emplace(Args&&... args) std::pair<iterator, bool> emplace(Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...); return table_.emplace(boost::forward<Args>(args)...);
} }
template <class... Args> template <class... Args>
iterator emplace_hint(const_iterator, Args&&... args) iterator emplace_hint(const_iterator, Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...).first; return table_.emplace(boost::forward<Args>(args)...).first;
} }
#else #else
@ -702,17 +702,17 @@ namespace unordered
// emplace // emplace
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class... Args> template <class... Args>
iterator emplace(Args&&... args) iterator emplace(Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...); return table_.emplace(boost::forward<Args>(args)...);
} }
template <class... Args> template <class... Args>
iterator emplace_hint(const_iterator, Args&&... args) iterator emplace_hint(const_iterator, Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...); return table_.emplace(boost::forward<Args>(args)...);
} }
#else #else

4
test/objects/cxx11_allocator.hpp
View File

@ -168,10 +168,10 @@ namespace test
new(p) T(t); new(p) T(t);
} }
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template<typename... Args> void construct(T* p, Args&&... args) { template<typename... Args> void construct(T* p, Args&&... args) {
detail::tracker.track_construct((void*) p, sizeof(T), tag_); detail::tracker.track_construct((void*) p, sizeof(T), tag_);
new(p) T(std::forward<Args>(args)...); new(p) T(boost::forward<Args>(args)...);
} }
#endif #endif

4
test/objects/exception.hpp
View File

@ -357,11 +357,11 @@ namespace exception
detail::tracker.track_construct((void*) p, sizeof(T), tag_); detail::tracker.track_construct((void*) p, sizeof(T), tag_);
} }
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template<class... Args> void construct(T* p, Args&&... args) { template<class... Args> void construct(T* p, Args&&... args) {
UNORDERED_SCOPE(allocator::construct(pointer, Args&&...)) { UNORDERED_SCOPE(allocator::construct(pointer, Args&&...)) {
UNORDERED_EPOINT("Mock allocator construct function."); UNORDERED_EPOINT("Mock allocator construct function.");
new(p) T(std::forward<Args>(args)...); new(p) T(boost::forward<Args>(args)...);
} }
detail::tracker.track_construct((void*) p, sizeof(T), tag_); detail::tracker.track_construct((void*) p, sizeof(T), tag_);
} }

8
test/objects/minimal.hpp
View File

@ -367,9 +367,9 @@ namespace minimal
void construct(T* p, T const& t) { new((void*)p) T(t); } void construct(T* p, T const& t) { new((void*)p) T(t); }
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template<class... Args> void construct(T* p, Args&&... args) { template<class... Args> void construct(T* p, Args&&... args) {
new((void*)p) T(std::forward<Args>(args)...); new((void*)p) T(boost::forward<Args>(args)...);
} }
#endif #endif
@ -439,9 +439,9 @@ namespace minimal
void construct(T* p, T const& t) { new((void*)p) T(t); } void construct(T* p, T const& t) { new((void*)p) T(t); }
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template<class... Args> void construct(T* p, Args&&... args) { template<class... Args> void construct(T* p, Args&&... args) {
new((void*)p) T(std::forward<Args>(args)...); new((void*)p) T(boost::forward<Args>(args)...);
} }
#endif #endif

4
test/objects/test.hpp
View File

@ -259,10 +259,10 @@ namespace test
new(p) T(t); new(p) T(t);
} }
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template<class... Args> void construct(T* p, Args&&... args) { template<class... Args> void construct(T* p, Args&&... args) {
detail::tracker.track_construct((void*) p, sizeof(T), tag_); detail::tracker.track_construct((void*) p, sizeof(T), tag_);
new(p) T(std::forward<Args>(args)...); new(p) T(boost::forward<Args>(args)...);
} }
#endif #endif

21
test/unordered/unnecessary_copy_tests.cpp
View File

@ -9,6 +9,23 @@
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include "../helpers/test.hpp" #include "../helpers/test.hpp"
#if defined(BOOST_UNORDERED_VARIADIC_MOVE)
# if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
# elif defined(__STD_RWCOMPILER_H__) || defined(_RWSTD_VER)
# elif defined(_LIBCPP_VERSION)
# define BOOST_UNORDERED_VARIADIC_MOVE
# elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
# if defined(__GLIBCXX__) && __GLIBCXX__ >= 20090804
# define BOOST_UNORDERED_VARIADIC_MOVE
# endif
# elif defined(__STL_CONFIG_H)
# elif defined(__MSL_CPP__)
# elif defined(__IBMCPP__)
# elif defined(MSIPL_COMPILE_H)
# elif (defined(_YVALS) && !defined(__IBMCPP__)) || defined(_CPPLIB_VER)
# endif
#endif
namespace unnecessary_copy_tests namespace unnecessary_copy_tests
{ {
struct count_copies struct count_copies
@ -243,9 +260,7 @@ namespace unnecessary_copy_tests
// the existing element. // the existing element.
reset(); reset();
x.emplace(); x.emplace();
#if defined(BOOST_UNORDERED_STD_FORWARD_MOVE) #if !defined(BOOST_NO_RVALUE_REFERENCES)
COPY_COUNT(1); MOVE_COUNT(0);
#elif !defined(BOOST_NO_RVALUE_REFERENCES)
// source_cost doesn't make much sense here, but it seems to fit. // source_cost doesn't make much sense here, but it seems to fit.
COPY_COUNT(1); MOVE_COUNT(source_cost); COPY_COUNT(1); MOVE_COUNT(source_cost);
#else #else