fixing level at which sequence base is applied

[SVN r36460]
This commit is contained in:
Dan Marsden
2006-12-19 14:46:40 +00:00
parent 6ed683b610
commit ef48d728ef
4 changed files with 11 additions and 5 deletions

View File

@ -13,6 +13,7 @@
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <boost/mpl/plus.hpp> #include <boost/mpl/plus.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp> #include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/type_traits/add_const.hpp> #include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/add_reference.hpp> #include <boost/type_traits/add_reference.hpp>
@ -20,7 +21,8 @@
namespace boost { namespace fusion { namespace boost { namespace fusion {
template<typename Deque, typename T> template<typename Deque, typename T>
struct back_extended_deque struct back_extended_deque
: detail::keyed_element<typename Deque::next_up, T, Deque> : detail::keyed_element<typename Deque::next_up, T, Deque>,
sequence_base<back_extended_deque<Deque, T> >
{ {
typedef detail::keyed_element<typename Deque::next_up, T, Deque> base; typedef detail::keyed_element<typename Deque::next_up, T, Deque> base;
typedef typename Deque::next_down next_down; typedef typename Deque::next_down next_down;

View File

@ -28,6 +28,8 @@
#include <boost/fusion/sequence/container/deque/detail/end_impl.hpp> #include <boost/fusion/sequence/container/deque/detail/end_impl.hpp>
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
#include <boost/fusion/support/sequence_base.hpp>
namespace boost { namespace fusion { namespace boost { namespace fusion {
struct deque_tag; struct deque_tag;
@ -39,7 +41,8 @@ namespace boost { namespace fusion {
template<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, typename T)> template<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, typename T)>
struct deque struct deque
: :
detail::deque_keyed_values<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, T)>::type detail::deque_keyed_values<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, T)>::type,
sequence_base<deque<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, T)> >
{ {
typedef deque_tag fusion_tag; typedef deque_tag fusion_tag;
typedef typename detail::deque_keyed_values<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, T)>::type base; typedef typename detail::deque_keyed_values<BOOST_PP_ENUM_PARAMS(FUSION_MAX_DEQUE_SIZE, T)>::type base;

View File

@ -9,7 +9,6 @@
#if !defined(BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330) #if !defined(BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330)
#define BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330 #define BOOST_FUSION_DEQUE_DETAIL_KEYED_ELEMENT_26112006_1330
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/type_traits/add_reference.hpp> #include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/add_const.hpp> #include <boost/type_traits/add_const.hpp>
@ -20,7 +19,6 @@ namespace boost { namespace fusion {
namespace detail { namespace detail {
struct nil_keyed_element struct nil_keyed_element
: sequence_base<nil_keyed_element>
{ {
typedef fusion_sequence_tag tag; typedef fusion_sequence_tag tag;
void get(); void get();

View File

@ -18,10 +18,13 @@
#include <boost/type_traits/add_const.hpp> #include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/add_reference.hpp> #include <boost/type_traits/add_reference.hpp>
#include <boost/fusion/support/sequence_base.hpp>
namespace boost { namespace fusion { namespace boost { namespace fusion {
template<typename Deque, typename T> template<typename Deque, typename T>
struct front_extended_deque struct front_extended_deque
: detail::keyed_element<typename Deque::next_down, T, Deque> : detail::keyed_element<typename Deque::next_down, T, Deque>,
sequence_base<front_extended_deque<Deque, T> >
{ {
typedef detail::keyed_element<typename Deque::next_down, T, Deque> base; typedef detail::keyed_element<typename Deque::next_down, T, Deque> base;
typedef mpl::int_<mpl::minus<typename Deque::next_down, mpl::int_<1> >::value> next_down; typedef mpl::int_<mpl::minus<typename Deque::next_down, mpl::int_<1> >::value> next_down;