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

fixed bug where first element is convertible from input sequence

Browse Source 
[SVN r37475]
This commit is contained in:
Joel de Guzman
2007-04-20 03:45:36 +00:00
parent bf4c542d5d
commit d87b6aaf57
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/ ==============================================================================*/
// No include guard. This file is meant to be included many times // No include guard. This file is meant to be included many times
@ -46,7 +46,7 @@
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_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_COPY_INIT, _) {}
@ -75,7 +75,7 @@
struct BOOST_PP_CAT(vector, N) struct BOOST_PP_CAT(vector, N)
: BOOST_PP_CAT(vector_data, N)< : BOOST_PP_CAT(vector_data, N)<
BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, T)> BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, T)>
, BOOST_PP_ENUM_PARAMS(N, T)> , BOOST_PP_ENUM_PARAMS(N, T)>
{ {
typedef BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, T)> this_type; typedef BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N, T)> this_type;
typedef BOOST_PP_CAT(vector_data, N)<this_type, BOOST_PP_ENUM_PARAMS(N, T)> base_type; typedef BOOST_PP_CAT(vector_data, N)<this_type, BOOST_PP_ENUM_PARAMS(N, T)> base_type;
@ -85,7 +85,7 @@
typedef mpl::false_ is_view; typedef mpl::false_ is_view;
typedef random_access_traversal_tag category; typedef random_access_traversal_tag category;
typedef mpl::int_<N> size; typedef mpl::int_<N> size;
BOOST_PP_CAT(vector, N)() {} BOOST_PP_CAT(vector, N)() {}
#if (N == 1) #if (N == 1)
@ -104,7 +104,10 @@
template <typename Sequence> template <typename Sequence>
BOOST_PP_CAT(vector, N)( BOOST_PP_CAT(vector, N)(
Sequence const& seq Sequence const& seq
, typename disable_if<is_convertible<Sequence, T0> >::type* dummy = 0) #if (N == 1)
, typename disable_if<is_convertible<Sequence, T0> >::type* dummy = 0
#endif
)
: base_type(base_type::init_from_sequence(seq)) {} : base_type(base_type::init_from_sequence(seq)) {}
template <BOOST_PP_ENUM_PARAMS(N, typename U)> template <BOOST_PP_ENUM_PARAMS(N, typename U)>
@ -125,18 +128,18 @@
BOOST_PP_REPEAT(N, FUSION_DEREF_MEMBER_ASSIGN, _) BOOST_PP_REPEAT(N, FUSION_DEREF_MEMBER_ASSIGN, _)
return *this; return *this;
} }
BOOST_PP_REPEAT(N, FUSION_AT_IMPL, _) BOOST_PP_REPEAT(N, FUSION_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
at_impl(I i) at_impl(I i)
{ {
return this->at_impl(mpl::int_<I::value>()); return this->at_impl(mpl::int_<I::value>());
} }
template<typename I> template<typename I>
typename add_reference<typename add_const<typename mpl::at<types, I>::type>::type>::type typename add_reference<typename add_const<typename mpl::at<types, I>::type>::type>::type
at_impl(I i) const at_impl(I i) const
{ {
return this->at_impl(mpl::int_<I::value>()); return this->at_impl(mpl::int_<I::value>());