result_of and polymorphic function obj compatibility

[SVN r37962]
This commit is contained in:
Dan Marsden
2007-06-11 07:01:05 +00:00
parent 414b87dbdb
commit 0fcbc5b467
42 changed files with 477 additions and 410 deletions

View File

@ -1,11 +1,14 @@
/*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman
Copyright (c) 2007 Dan Marsden
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)
==============================================================================*/
#if !defined(FUSION_APPLY_TRANSFORM_RESULT_02092006_1936)
#define FUSION_APPLY_TRANSFORM_RESULT_02092006_1936
#if !defined(BOOST_FUSION_APPLY_TRANSFORM_RESULT_02092006_1936)
#define BOOST_FUSION_APPLY_TRANSFORM_RESULT_02092006_1936
#include <boost/utility/result_of.hpp>
namespace boost { namespace fusion
{
@ -18,15 +21,13 @@ namespace boost { namespace fusion
{
template <typename T0, typename T1 = void_>
struct apply
{
typedef typename F::template result<T0, T1>::type type;
};
: boost::result_of<F(T0, T1)>
{};
template <typename T0>
struct apply<T0, void_>
{
typedef typename F::template result<T0>::type type;
};
: boost::result_of<F(T0)>
{};
};
}
}}

View File

@ -21,13 +21,16 @@ namespace boost { namespace fusion {
template<typename N>
struct poly_advance
{
template<typename It>
struct result
template<typename T>
struct result;
template<typename N1, typename It>
struct result<poly_advance<N1>(It)>
: result_of::advance<It,N>
{};
template<typename It>
typename result<It>::type
typename result<poly_advance(It)>::type
operator()(const It& it) const
{
return fusion::advance<N>(it);

View File

@ -30,8 +30,11 @@ namespace boost { namespace fusion
template<typename N>
struct poly_at
{
template<typename SeqRef>
struct result
template<typename T>
struct result;
template<typename N1, typename SeqRef>
struct result<poly_at<N1>(SeqRef)>
: mpl::eval_if<is_same<SeqRef, unused_type const&>,
mpl::identity<unused_type>,
result_of::at<typename remove_reference<SeqRef>::type, N> >
@ -40,14 +43,14 @@ namespace boost { namespace fusion
};
template<typename Seq>
typename result<Seq&>::type
typename result<poly_at(Seq&)>::type
operator()(Seq& seq) const
{
return fusion::at<N>(seq);
}
template<typename Seq>
typename result<Seq const&>::type
typename result<poly_at(Seq const&)>::type
operator()(Seq const& seq) const
{
return fusion::at<N>(seq);

View File

@ -27,8 +27,11 @@ namespace boost { namespace fusion {
{
struct poly_begin
{
template<typename T>
struct result;
template<typename SeqRef>
struct result
struct result<poly_begin(SeqRef)>
: mpl::eval_if<is_same<SeqRef, unused_type const&>,
mpl::identity<unused_type>,
result_of::begin<typename remove_reference<SeqRef>::type> >
@ -37,14 +40,14 @@ namespace boost { namespace fusion {
};
template<typename Seq>
typename result<Seq&>::type
typename result<poly_begin(Seq&)>::type
operator()(Seq& seq) const
{
return fusion::begin(seq);
}
template<typename Seq>
typename result<Seq const&>::type
typename result<poly_begin(Seq const&)>::type
operator()(Seq const& seq) const
{
return fusion::begin(seq);

View File

@ -25,15 +25,18 @@ namespace boost { namespace fusion {
{
struct poly_deref
{
template<typename T>
struct result;
template<typename It>
struct result
struct result<poly_deref(It)>
: mpl::eval_if<is_same<It, unused_type>,
mpl::identity<unused_type>,
result_of::deref<It> >
{};
template<typename It>
typename result<It>::type
typename result<poly_deref(It)>::type
operator()(const It& it) const
{
return fusion::deref(it);

View File

@ -41,8 +41,11 @@ namespace boost { namespace fusion {
template<typename M>
struct endpoints
{
template<typename SeqRef>
struct result
template<typename T>
struct result;
template<typename M1, typename SeqRef>
struct result<endpoints<M1>(SeqRef)>
: mpl::eval_if<is_same<SeqRef, unused_type const&>,
mpl::identity<unused_type>,
get_endpoint<SeqRef, M> >
@ -51,14 +54,14 @@ namespace boost { namespace fusion {
};
template<typename Seq>
typename result<Seq&>::type
typename result<endpoints(Seq&)>::type
operator()(Seq& seq) const
{
return fusion::advance<M>(fusion::begin(seq));
}
template<typename Seq>
typename result<Seq const&>::type
typename result<endpoints(Seq const&)>::type
operator()(Seq const& seq)
{
return fusion::advance<M>(fusion::begin(seq));

View File

@ -24,15 +24,18 @@ namespace boost { namespace fusion {
{
struct poly_next
{
template<typename T>
struct result;
template<typename It>
struct result
struct result<poly_next(It)>
: mpl::eval_if<is_same<It, unused_type>,
mpl::identity<unused_type>,
result_of::next<It> >
{};
template<typename It>
typename result<It>::type
typename result<poly_next(It)>::type
operator()(const It& it) const
{
return fusion::next(it);

View File

@ -24,15 +24,18 @@ namespace boost { namespace fusion {
{
struct poly_prior
{
template<typename T>
struct result;
template<typename It>
struct result
struct result<poly_prior(It)>
: mpl::eval_if<is_same<It, unused_type>,
mpl::identity<unused_type>,
result_of::prior<It> >
{};
template<typename It>
typename result<It>::type
typename result<poly_prior(It)>::type
operator()(const It& it) const
{
return fusion::prior(it);

View File

@ -10,7 +10,6 @@
#include <boost/mpl/or.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/placeholders.hpp>
#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/sequence/intrinsic/mpl.hpp>
#include <boost/fusion/algorithm/iteration/fold.hpp>
@ -38,21 +37,27 @@ namespace boost { namespace fusion {
typedef Tag2 type;
};
template<typename Next, typename StrictestSoFar>
struct strictest_traversal_impl
{
typedef StrictestSoFar tag1;
typedef typename traits::category_of<
typename remove_reference<Next>::type>::type tag2;
template<typename T>
struct result;
typedef typename stricter_traversal<tag1,tag2>::type type;
template<typename Next, typename StrictestSoFar>
struct result<strictest_traversal_impl(Next, StrictestSoFar)>
{
typedef StrictestSoFar tag1;
typedef typename traits::category_of<
typename remove_reference<Next>::type>::type tag2;
typedef typename stricter_traversal<tag1,tag2>::type type;
};
};
template<typename Sequence>
struct strictest_traversal
: result_of::fold<
Sequence, fusion::random_access_traversal_tag,
strictest_traversal_impl<boost::mpl::_,boost::mpl::_> >
strictest_traversal_impl>
{};
}

View File

@ -26,8 +26,11 @@ namespace boost { namespace fusion {
template<typename N>
struct poly_value_at
{
template<typename Seq>
struct result
template<typename T>
struct result;
template<typename N1, typename Seq>
struct result<poly_value_at<N1>(Seq)>
: mpl::eval_if<is_same<Seq, unused_type const&>,
mpl::identity<unused_type>,
result_of::value_at<typename remove_reference<Seq>::type, N> >

View File

@ -25,8 +25,11 @@ namespace boost { namespace fusion {
{
struct poly_value_of
{
template<typename T>
struct result;
template<typename It>
struct result
struct result<poly_value_of(It)>
: mpl::eval_if<is_same<It, unused_type>,
mpl::identity<unused_type>,
result_of::value_of<It> >

View File

@ -32,6 +32,7 @@
#include <boost/mpl/find_if.hpp>
#include <boost/mpl/equal_to.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/eval_if.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <boost/type_traits/is_reference.hpp>
@ -47,27 +48,31 @@ namespace boost { namespace fusion {
struct seq_ref_size
{
template<typename Seq,
typename SeqClass = typename remove_reference<Seq>::type,
bool HasSize = traits::is_forward<SeqClass>::value
>
struct result
: result_of::size<SeqClass>
{};
template<typename Params>
struct result;
static int const int_max = static_cast<int>(
static_cast<unsigned>(~0) >> 1);
template<typename Seq>
struct result<seq_ref_size(Seq)>
{
static int const int_max = static_cast<int>(
static_cast<unsigned>(~0) >> 1);
template<typename Seq, typename SeqClass>
struct result<Seq, SeqClass, false>
: mpl::int_<int_max>
{};
typedef typename remove_reference<Seq>::type SeqClass;
typedef typename mpl::eval_if<
traits::is_forward<SeqClass>,
result_of::size<SeqClass>,
mpl::int_<int_max> >::type type;
};
};
struct poly_min
{
template<typename T>
struct result;
template<typename Lhs, typename Rhs>
struct result
struct result<poly_min(Lhs, Rhs)>
: mpl::min<Lhs, Rhs>
{};
};