diff options
Diffstat (limited to 'boost/fusion/container/deque/front_extended_deque.hpp')
| -rw-r--r-- | boost/fusion/container/deque/front_extended_deque.hpp | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/boost/fusion/container/deque/front_extended_deque.hpp b/boost/fusion/container/deque/front_extended_deque.hpp index 7a7f9cee29..2f3654ede2 100644 --- a/boost/fusion/container/deque/front_extended_deque.hpp +++ b/boost/fusion/container/deque/front_extended_deque.hpp @@ -1,5 +1,5 @@ /*============================================================================= - Copyright (c) 2005-2011 Joel de Guzman + Copyright (c) 2005-2012 Joel de Guzman Copyright (c) 2005-2006 Dan Marsden Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -8,32 +8,39 @@ #if !defined(BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209) #define BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209 -#include <boost/fusion/container/deque/detail/keyed_element.hpp> #include <boost/mpl/int.hpp> -#include <boost/mpl/minus.hpp> -#include <boost/mpl/plus.hpp> -#include <boost/fusion/sequence/intrinsic/size.hpp> - -#include <boost/type_traits/add_const.hpp> -#include <boost/type_traits/add_reference.hpp> - #include <boost/fusion/support/sequence_base.hpp> +#include <boost/fusion/sequence/intrinsic/size.hpp> +#include <boost/fusion/container/deque/detail/keyed_element.hpp> namespace boost { namespace fusion { - template<typename Deque, typename T> + template <typename Deque, typename T> struct front_extended_deque - : detail::keyed_element<typename Deque::next_down, T, Deque>, - sequence_base<front_extended_deque<Deque, T> > + : 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 mpl::int_<mpl::minus<typename Deque::next_down, mpl::int_<1> >::value> next_down; + typedef mpl::int_<(Deque::next_down::value - 1)> next_down; typedef typename Deque::next_up next_up; - typedef mpl::plus<typename result_of::size<Deque>::type, mpl::int_<1> > size; + typedef mpl::int_<(result_of::size<Deque>::value + 1)> size; + + template <typename Arg> + front_extended_deque(Deque const& deque, Arg const& val) + : base(val, deque) + {} - front_extended_deque(Deque const& deque, typename add_reference<typename add_const<T>::type>::type t) - : base(t, deque) +#if defined(BOOST_NO_RVALUE_REFERENCES) + template <typename Arg> + front_extended_deque(Deque const& deque, Arg& val) + : base(val, deque) {} +#else + template <typename Arg> + front_extended_deque(Deque const& deque, Arg&& val) + : base(std::forward<Arg>(val), deque) + {} +#endif }; }} |