boostorg/fusion
1
0
Fork 1
mirror of https://github.com/boostorg/fusion.git synced 2025-07-25 18:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

conform to TR1 to the letter

Browse Source 
[SVN r48244]
This commit is contained in:
Joel de Guzman
2008-08-20 08:20:40 +00:00
parent e165418461
commit 7c74332487
2 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/boost/fusion/tuple/detail/tuple_forward_ctor.hpp → include/boost/fusion/tuple/detail/tuple_expand.hpp
View File

@ -5,15 +5,15 @@
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
#ifndef BOOST_PP_IS_ITERATING
#if !defined(FUSION_TUPLE_FORWARD_CTOR_10032005_0815)
#define FUSION_TUPLE_FORWARD_CTOR_10032005_0815
#if !defined(FUSION_TUPLE_EXPAND_10032005_0815)
#define FUSION_TUPLE_EXPAND_10032005_0815
#include <boost/preprocessor/iterate.hpp>
#include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/preprocessor/repetition/enum_binary_params.hpp>
#define BOOST_PP_FILENAME_1 \
<boost/fusion/tuple/detail/tuple_forward_ctor.hpp>
<boost/fusion/tuple/detail/tuple_expand.hpp>
#define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
#include BOOST_PP_ITERATE()
@ -34,6 +34,22 @@
N, typename detail::call_param<T, >::type _))
: base_type(BOOST_PP_ENUM_PARAMS(N, _)) {}
template <BOOST_PP_ENUM_PARAMS(N, typename U)>
tuple(BOOST_PP_ENUM_BINARY_PARAMS(
N, typename detail::call_param<U, >::type _))
: base_type(BOOST_PP_ENUM_PARAMS(N, _)) {}
template <BOOST_PP_ENUM_PARAMS(N, typename U)>
tuple(tuple<BOOST_PP_ENUM_PARAMS(N, U)> const& rhs)
: base_type(rhs) {}
template <BOOST_PP_ENUM_PARAMS(N, typename U)>
tuple& operator=(tuple<BOOST_PP_ENUM_PARAMS(N, U)> const& rhs)
{
base_type::operator=(rhs);
return *this;
}
#undef N
#endif // defined(BOOST_PP_IS_ITERATING)

24
include/boost/fusion/tuple/tuple.hpp
View File

@ -16,6 +16,7 @@
#include <boost/fusion/sequence/io.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/is_const.hpp>
#include <utility>
namespace boost { namespace fusion
{
@ -29,11 +30,14 @@ namespace boost { namespace fusion
tuple()
: base_type() {}
template <typename Sequence>
tuple(Sequence const& rhs)
tuple(tuple const& rhs)
: base_type(rhs) {}
#include <boost/fusion/tuple/detail/tuple_forward_ctor.hpp>
template <typename U1, typename U2>
tuple(std::pair<U1, U2> const& rhs)
: base_type(rhs) {}
#include <boost/fusion/tuple/detail/tuple_expand.hpp>
template <typename T>
tuple&
@ -42,6 +46,20 @@ namespace boost { namespace fusion
base_type::operator=(rhs);
return *this;
}
tuple&
operator=(tuple const& rhs)
{
base_type::operator=(rhs);
return *this;
}
template <typename U1, typename U2>
operator=(std::pair<U1, U2> const& rhs)
{
base_type::operator=(rhs);
return *this;
}
};
template <typename Tuple>