feedc0de/boost_fusion
1
0
Fork 0
forked from boostorg/fusion
Code Pull Requests Activity

move-assign for vector

Browse Source 
[SVN r80345]
This commit is contained in:
Joel de Guzman
2012-09-01 02:01:26 +00:00
parent 705ca2b61b
commit a53f93ff1a
5 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/fusion/container/deque/deque.hpp
View File

@ -131,13 +131,6 @@ namespace boost { namespace fusion
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_RVALUE_REFERENCES)
template <typename ...Elements>
deque& operator=(deque<Elements...>&& rhs)
{
base::operator=(std::forward<deque<Elements...>>(rhs));
return *this;
}
template <typename T> template <typename T>
deque& operator=(T&& rhs) deque& operator=(T&& rhs)
{ {

9
include/boost/fusion/container/deque/detail/cpp03_deque.hpp
View File

@ -135,15 +135,6 @@ namespace boost { namespace fusion {
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_RVALUE_REFERENCES)
template <BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, typename U)>
deque&
operator=(deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)>&& rhs)
{
base::operator=(std::forward<
deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, U)>>(rhs));
return *this;
}
template <typename T> template <typename T>
deque& deque&
operator=(T&& rhs) operator=(T&& rhs)

8
include/boost/fusion/container/deque/detail/keyed_element.hpp
View File

@ -124,14 +124,6 @@ namespace boost { namespace fusion { namespace detail
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_RVALUE_REFERENCES)
template<typename U, typename Rst>
keyed_element& operator=(keyed_element<Key, U, Rst>&& rhs)
{
base::operator=(std::forward<keyed_element<Key, U, Rst>>(rhs));
value_ = std::forward<U>(rhs.value_);
return *this;
}
keyed_element& operator=(keyed_element&& rhs) keyed_element& operator=(keyed_element&& rhs)
{ {
base::operator=(std::forward<keyed_element>(rhs)); base::operator=(std::forward<keyed_element>(rhs));

65
include/boost/fusion/container/vector/detail/vector_n.hpp
View File

@ -9,27 +9,31 @@
#if !defined(FUSION_MACRO_05042005) #if !defined(FUSION_MACRO_05042005)
#define FUSION_MACRO_05042005 #define FUSION_MACRO_05042005
#define FUSION_MEMBER_DEFAULT_INIT(z, n, _) m##n() #define FUSION_VECTOR_MEMBER_MEMBER_DEFAULT_INIT(z, n, _) m##n()
#define FUSION_MEMBER_INIT(z, n, _) m##n(_##n) #define FUSION_VECTOR_MEMBER_MEMBER_INIT(z, n, _) m##n(_##n)
#define FUSION_COPY_INIT(z, n, _) m##n(other.m##n) #define FUSION_VECTOR_MEMBER_COPY_INIT(z, n, _) m##n(other.m##n)
#define FUSION_MOVE_FROM_OTHER(z, n, _) m##n(std::move(other.m##n)) #define FUSION_VECTOR_MEMBER_FWD(z, n, _) m##n(std::forward<T##n>(other.m##n))
#define FUSION_MOVE(z, n, _) m##n(std::move(_##n)) #define FUSION_VECTOR_ARG_FWD(z, n, _) m##n(std::forward<T##n>(_##n))
#define FUSION_MEMBER_DECL(z, n, _) T##n m##n; #define FUSION_VECTOR_MEMBER_MEMBER_DECL(z, n, _) T##n m##n;
#define FUSION_FORWARD(z, n, _) std::forward<T##n>(_##n) #define FUSION_VECTOR_MEMBER_FORWARD(z, n, _) std::forward<T##n>(_##n)
#define FUSION_MEMBER_ASSIGN(z, n, _) \ #define FUSION_VECTOR_MEMBER_MEMBER_ASSIGN(z, n, _) \
this->BOOST_PP_CAT(m, n) = vec.BOOST_PP_CAT(m, n); this->BOOST_PP_CAT(m, n) = vec.BOOST_PP_CAT(m, n);
#define FUSION_DEREF_MEMBER_ASSIGN(z, n, _) \ #define FUSION_VECTOR_MEMBER_DEREF_MEMBER_ASSIGN(z, n, _) \
this->BOOST_PP_CAT(m, n) = *BOOST_PP_CAT(i, n); this->BOOST_PP_CAT(m, n) = *BOOST_PP_CAT(i, n);
#define FUSION_AT_IMPL(z, n, _) \ #define FUSION_VECTOR_MEMBER_MEMBER_FORWARD(z, n, _) \
this->BOOST_PP_CAT(m, n) = std::forward< \
BOOST_PP_CAT(T, n)>(vec.BOOST_PP_CAT(m, n));
#define FUSION_VECTOR_MEMBER_AT_IMPL(z, n, _) \
typename add_reference<T##n>::type \ typename add_reference<T##n>::type \
at_impl(mpl::int_<n>) { return this->m##n; } \ at_impl(mpl::int_<n>) { return this->m##n; } \
typename add_reference<typename add_const<T##n>::type>::type \ typename add_reference<typename add_const<T##n>::type>::type \
at_impl(mpl::int_<n>) const { return this->m##n; } at_impl(mpl::int_<n>) const { return this->m##n; }
#define FUSION_ITER_DECL_VAR(z, n, _) \ #define FUSION_VECTOR_MEMBER_ITER_DECL_VAR(z, n, _) \
typedef typename result_of::next< \ typedef typename result_of::next< \
BOOST_PP_CAT(I, BOOST_PP_DEC(n))>::type BOOST_PP_CAT(I, n); \ BOOST_PP_CAT(I, BOOST_PP_DEC(n))>::type BOOST_PP_CAT(I, n); \
BOOST_PP_CAT(I, n) BOOST_PP_CAT(i, n) \ BOOST_PP_CAT(I, n) BOOST_PP_CAT(i, n) \
@ -43,32 +47,32 @@
struct BOOST_PP_CAT(vector_data, N) struct BOOST_PP_CAT(vector_data, N)
{ {
BOOST_PP_CAT(vector_data, N)() BOOST_PP_CAT(vector_data, N)()
: BOOST_PP_ENUM(N, FUSION_MEMBER_DEFAULT_INIT, _) {} : BOOST_PP_ENUM(N, FUSION_VECTOR_MEMBER_MEMBER_DEFAULT_INIT, _) {}
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_RVALUE_REFERENCES)
BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, T, && _)) BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, T, && _))
: BOOST_PP_ENUM(N, FUSION_MOVE, _) {} : BOOST_PP_ENUM(N, FUSION_VECTOR_ARG_FWD, _) {}
#endif #endif
BOOST_PP_CAT(vector_data, N)( BOOST_PP_CAT(vector_data, N)(
BOOST_PP_ENUM_BINARY_PARAMS( BOOST_PP_ENUM_BINARY_PARAMS(
N, typename detail::call_param<T, >::type _)) N, typename detail::call_param<T, >::type _))
: BOOST_PP_ENUM(N, FUSION_MEMBER_INIT, _) {} : BOOST_PP_ENUM(N, FUSION_VECTOR_MEMBER_MEMBER_INIT, _) {}
BOOST_PP_CAT(vector_data, N)( BOOST_PP_CAT(vector_data, N)(
BOOST_PP_CAT(vector_data, N) const& other) BOOST_PP_CAT(vector_data, N) const& other)
: BOOST_PP_ENUM(N, FUSION_COPY_INIT, _) {} : BOOST_PP_ENUM(N, FUSION_VECTOR_MEMBER_COPY_INIT, _) {}
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_RVALUE_REFERENCES)
BOOST_PP_CAT(vector_data, N)( BOOST_PP_CAT(vector_data, N)(
BOOST_PP_CAT(vector_data, N)&& other) BOOST_PP_CAT(vector_data, N)&& other)
: BOOST_PP_ENUM(N, FUSION_MOVE_FROM_OTHER, _) {} : BOOST_PP_ENUM(N, FUSION_VECTOR_MEMBER_FWD, _) {}
#endif #endif
BOOST_PP_CAT(vector_data, N)& BOOST_PP_CAT(vector_data, N)&
operator=(BOOST_PP_CAT(vector_data, N) const& vec) operator=(BOOST_PP_CAT(vector_data, N) const& vec)
{ {
BOOST_PP_REPEAT(N, FUSION_MEMBER_ASSIGN, _) BOOST_PP_REPEAT(N, FUSION_VECTOR_MEMBER_MEMBER_ASSIGN, _)
return *this; return *this;
} }
@ -78,7 +82,7 @@
{ {
typedef typename result_of::begin<Sequence const>::type I0; typedef typename result_of::begin<Sequence const>::type I0;
I0 i0 = fusion::begin(seq); I0 i0 = fusion::begin(seq);
BOOST_PP_REPEAT_FROM_TO(1, N, FUSION_ITER_DECL_VAR, _) BOOST_PP_REPEAT_FROM_TO(1, N, FUSION_VECTOR_MEMBER_ITER_DECL_VAR, _)
return BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_PARAMS(N, *i)); return BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_PARAMS(N, *i));
} }
@ -88,11 +92,11 @@
{ {
typedef typename result_of::begin<Sequence>::type I0; typedef typename result_of::begin<Sequence>::type I0;
I0 i0 = fusion::begin(seq); I0 i0 = fusion::begin(seq);
BOOST_PP_REPEAT_FROM_TO(1, N, FUSION_ITER_DECL_VAR, _) BOOST_PP_REPEAT_FROM_TO(1, N, FUSION_VECTOR_MEMBER_ITER_DECL_VAR, _)
return BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_PARAMS(N, *i)); return BOOST_PP_CAT(vector_data, N)(BOOST_PP_ENUM_PARAMS(N, *i));
} }
BOOST_PP_REPEAT(N, FUSION_MEMBER_DECL, _) BOOST_PP_REPEAT(N, FUSION_VECTOR_MEMBER_MEMBER_DECL, _)
}; };
template <BOOST_PP_ENUM_PARAMS(N, typename T)> template <BOOST_PP_ENUM_PARAMS(N, typename T)>
@ -124,12 +128,12 @@
explicit explicit
#endif #endif
BOOST_PP_CAT(vector, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, T, && _)) BOOST_PP_CAT(vector, N)(BOOST_PP_ENUM_BINARY_PARAMS(N, T, && _))
: base_type(BOOST_PP_ENUM(N, FUSION_FORWARD, _)) {} : base_type(BOOST_PP_ENUM(N, FUSION_VECTOR_MEMBER_FORWARD, _)) {}
#endif #endif
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_RVALUE_REFERENCES)
BOOST_PP_CAT(vector, N)(BOOST_PP_CAT(vector, N)&& rhs) BOOST_PP_CAT(vector, N)(BOOST_PP_CAT(vector, N)&& rhs)
: base_type(std::move(rhs)) {} : base_type(std::forward<base_type>(rhs)) {}
#endif #endif
template <BOOST_PP_ENUM_PARAMS(N, typename U)> template <BOOST_PP_ENUM_PARAMS(N, typename U)>
@ -159,7 +163,7 @@
BOOST_PP_CAT(vector, N)& BOOST_PP_CAT(vector, N)&
operator=(BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, U)> const& vec) operator=(BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, U)> const& vec)
{ {
BOOST_PP_REPEAT(N, FUSION_MEMBER_ASSIGN, _) BOOST_PP_REPEAT(N, FUSION_VECTOR_MEMBER_MEMBER_ASSIGN, _)
return *this; return *this;
} }
@ -169,12 +173,21 @@
{ {
typedef typename result_of::begin<Sequence const>::type I0; typedef typename result_of::begin<Sequence const>::type I0;
I0 i0 = fusion::begin(seq); I0 i0 = fusion::begin(seq);
BOOST_PP_REPEAT_FROM_TO(1, N, FUSION_ITER_DECL_VAR, _) BOOST_PP_REPEAT_FROM_TO(1, N, FUSION_VECTOR_MEMBER_ITER_DECL_VAR, _)
BOOST_PP_REPEAT(N, FUSION_DEREF_MEMBER_ASSIGN, _) BOOST_PP_REPEAT(N, FUSION_VECTOR_MEMBER_DEREF_MEMBER_ASSIGN, _)
return *this; return *this;
} }
BOOST_PP_REPEAT(N, FUSION_AT_IMPL, _) #if !defined(BOOST_NO_RVALUE_REFERENCES)
BOOST_PP_CAT(vector, N)&
operator=(BOOST_PP_CAT(vector, N)&& vec)
{
BOOST_PP_REPEAT(N, FUSION_VECTOR_MEMBER_MEMBER_FORWARD, _)
return *this;
}
#endif
BOOST_PP_REPEAT(N, FUSION_VECTOR_MEMBER_AT_IMPL, _)
template<typename I> template<typename I>
typename add_reference<typename mpl::at<types, I>::type>::type typename add_reference<typename mpl::at<types, I>::type>::type

19
include/boost/fusion/container/vector/vector.hpp
View File

@ -108,7 +108,7 @@ namespace boost { namespace fusion
#if !defined(BOOST_NO_RVALUE_REFERENCES) #if !defined(BOOST_NO_RVALUE_REFERENCES)
vector(vector&& rhs) vector(vector&& rhs)
: vec(std::move(rhs.vec)) {} : vec(std::forward<vector_n>(rhs.vec)) {}
#endif #endif
template <typename Sequence> template <typename Sequence>
@ -140,6 +140,23 @@ namespace boost { namespace fusion
return *this; return *this;
} }
#if !defined(BOOST_NO_RVALUE_REFERENCES)
vector&
operator=(vector&& rhs)
{
vec = std::forward<vector_n>(rhs.vec);
return *this;
}
template <typename T>
vector&
operator=(T&& rhs)
{
vec = std::forward<T>(rhs);
return *this;
}
#endif
template <int N> template <int N>
typename add_reference< typename add_reference<
typename mpl::at_c<types, N>::type typename mpl::at_c<types, N>::type