|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55868 - in sandbox/SOC/2009/fusion: . boost/fusion/adapted/detail/mpl boost/fusion/algorithm/iteration boost/fusion/algorithm/iteration/detail boost/fusion/algorithm/query boost/fusion/algorithm/query/detail boost/fusion/algorithm/transformation boost/fusion/container/detail/variadic_templates boost/fusion/container/generation/detail/variadic_templates boost/fusion/container/list boost/fusion/container/list/detail/cons boost/fusion/iterator boost/fusion/sequence boost/fusion/sequence/intrinsic boost/fusion/support/internal boost/fusion/view/zip_view/detail libs/fusion/test/compile_time
From: mr.chr.schmidt_at_[hidden]
Date: 2009-08-29 16:42:08
Author: cschmidt
Date: 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
New Revision: 55868
URL: http://svn.boost.org/trac/boost/changeset/55868
Log:
cleanup
Text files modified:
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp | 35 ++++++++++++++++++
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/detail/fold.hpp | 77 ++++++++++++++++++---------------------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp | 14 ++++++-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/for_each.hpp | 4 -
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/all.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/all.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/find_if.hpp | 25 ++++++------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp | 21 +++-------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp | 4 ++
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp | 22 +++-------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_back.hpp | 8 ++--
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_front.hpp | 7 ++-
sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp | 14 +++++++
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/convert_impl.hpp | 4 +-
sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp | 5 ++
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/front.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp | 25 ++++++++++++
sandbox/SOC/2009/fusion/boost/fusion/support/internal/ref.hpp | 22 +++++++++++
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/begin_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/end_impl.hpp | 3 +
sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/Makefile | 2
sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/driver.hpp | 4 +-
sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/fold.cpp | 2
sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/transform.cpp | 2
sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_construction.cpp | 2
sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_intrinsic.cpp | 2
sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_iteration.cpp | 2
sandbox/SOC/2009/fusion/project-root.jam | 5 ++
33 files changed, 219 insertions(+), 117 deletions(-)
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -60,50 +60,85 @@
template <typename>
struct value_of
: extension::value_of_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<mpl_iterator_tag>,It>::type
+ >::template apply<It>
+=======
typename mpl::apply<mpl::always<mpl_iterator_tag>,It>::type
>::template apply<It>
+>>>>>>> .r55867
{};
template <typename, typename It2>
struct equal_to
: extension::equal_to_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<mpl_iterator_tag>,It>::type
+ >::template apply<It,It2>
+=======
typename mpl::apply<mpl::always<mpl_iterator_tag>,It>::type
>::template apply<It,It2>
+>>>>>>> .r55867
{};
template <typename>
struct deref
: extension::deref_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<mpl_iterator_tag>,It>::type
+ >::template apply<It>
+=======
typename mpl::apply<mpl::always<mpl_iterator_tag>,It>::type
>::template apply<It>
+>>>>>>> .r55867
{};
template <typename>
struct next
: extension::next_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<mpl_iterator_tag>,It>::type
+ >::template apply<It>
+=======
typename mpl::apply<mpl::always<mpl_iterator_tag>,It>::type
>::template apply<It>
+>>>>>>> .r55867
{};
template <typename>
struct prior
: extension::prior_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<mpl_iterator_tag>,It>::type
+ >::template apply<It>
+=======
typename mpl::apply<mpl::always<mpl_iterator_tag>,It>::type
>::template apply<It>
+>>>>>>> .r55867
{};
template <typename, typename N>
struct advance
: extension::advance_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<mpl_iterator_tag>,It>::type
+ >::template apply<It,N>
+=======
typename mpl::apply<mpl::always<mpl_iterator_tag>,It>::type
>::template apply<It,N>
+>>>>>>> .r55867
{};
template <typename, typename It2>
struct distance
: extension::distance_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<mpl_iterator_tag>,It>::type
+ >::template apply<It,It2>
+=======
typename mpl::apply<mpl::always<mpl_iterator_tag>,It>::type
>::template apply<It,It2>
+>>>>>>> .r55867
{};
};
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/detail/fold.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/detail/fold.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/detail/fold.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,6 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman
Copyright (c) 2006 Dan Marsden
+ Copyright (c) 2009 Christopher Schmidt
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)
@@ -28,10 +29,10 @@
namespace boost { namespace fusion { namespace detail
{
- template<int N>
+ template<typename Result,int N>
struct unrolled_fold
{
- template<typename Result,typename It0, typename State, typename F>
+ template<typename It0, typename State, typename F>
static Result
call(It0 const& it0,
BOOST_FUSION_R_ELSE_CLREF(State) state,
@@ -44,13 +45,13 @@
typedef typename result_of::next<It2&>::type It3;
It3 it3 = fusion::next(it2);
- return unrolled_fold<N-4>::template call<Result>(
+ return unrolled_fold<Result,N-4>::call(
fusion::next(it3),
f(fusion::deref(it3),
f(fusion::deref(it2),
f(fusion::deref(it1),
f(fusion::deref(it0),
- BOOST_FUSION_FORWARD(State,state)
+ BOOST_FUSION_FORWARD(State,state)
)
)
)
@@ -59,10 +60,10 @@
}
};
- template<>
- struct unrolled_fold<3>
+ template<typename Result>
+ struct unrolled_fold<Result,3>
{
- template<typename Result,typename It0, typename State, typename F>
+ template<typename It0, typename State, typename F>
static Result
call(It0 const& it0,
BOOST_FUSION_R_ELSE_CLREF(State) state,
@@ -84,10 +85,10 @@
}
};
- template<>
- struct unrolled_fold<2>
+ template<typename Result>
+ struct unrolled_fold<Result,2>
{
- template<typename Result,typename It0, typename State, typename F>
+ template<typename It0, typename State, typename F>
static Result
call(It0 const& it0,
BOOST_FUSION_R_ELSE_CLREF(State) state,
@@ -98,10 +99,10 @@
}
};
- template<>
- struct unrolled_fold<1>
+ template<typename Result>
+ struct unrolled_fold<Result,1>
{
- template<typename Result,typename It0, typename State, typename F>
+ template<typename It0, typename State, typename F>
static Result
call(It0 const& it0,
BOOST_FUSION_R_ELSE_CLREF(State) state,
@@ -111,10 +112,10 @@
}
};
- template<>
- struct unrolled_fold<0>
+ template<typename Result>
+ struct unrolled_fold<Result,0>
{
- template<typename Result,typename It0, typename State, typename F>
+ template<typename It0, typename State, typename F>
static Result
call(It0 const&,
BOOST_FUSION_R_ELSE_CLREF(State) state,
@@ -126,25 +127,22 @@
template <typename It, typename StateRef, typename F>
struct fold_apply
- {
- typedef typename
- boost::result_of<
- F(
+ : boost::result_of<
+ F(
#ifdef BOOST_NO_RVALUE_REFERENCES
- typename add_lref<
- typename add_const<
- typename result_of::deref<It>::type
- >::type
+ typename add_lref<
+ typename add_const<
+ typename result_of::deref<It>::type
>::type
+ >::type
#else
- typename result_of::deref<It>::type&&
+ typename result_of::deref<It>::type&&
#endif
- , StateRef)
- >::type
- type;
- };
+ , StateRef)
+ >
+ {};
- template <typename It, typename State, typename F>
+ template<typename It, typename State, typename F>
struct fold_apply_rvalue_state
: fold_apply<
It
@@ -185,7 +183,7 @@
typedef typename
fold_apply_rvalue_state<
- typename result_of::next<it1>::type
+ typename result_of::next<it1>::type
, typename fold_apply_rvalue_state<it1, rest1, F>::type
, F
>::type
@@ -194,15 +192,12 @@
template<typename It0, typename StateRef, typename F>
struct result_of_unrolled_fold<It0, StateRef, F, 2>
- {
- typedef typename
- fold_apply_rvalue_state<
- typename result_of::next<It0>::type
- , typename fold_apply_rvalue_state<It0, StateRef, F>::type
- , F
- >::type
- type;
- };
+ : fold_apply_rvalue_state<
+ typename result_of::next<It0>::type
+ , typename fold_apply_rvalue_state<It0, StateRef, F>::type
+ , F
+ >
+ {};
template<typename It0, typename StateRef, typename F>
struct result_of_unrolled_fold<It0, StateRef, F, 1>
@@ -251,7 +246,7 @@
static type
call(It0 const& it0, StateRef state, FRef f)
{
- return unrolled_fold<SeqSize>::template call<type>(
+ return unrolled_fold<type, SeqSize>::call(
it0,
BOOST_FUSION_FORWARD(StateRef,state),
BOOST_FUSION_FORWARD(FRef,f));
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -16,14 +16,20 @@
#include <boost/fusion/support/internal/assert.hpp>
#include <boost/fusion/algorithm/iteration/detail/fold.hpp>
+<<<<<<< .mine
+#ifdef BOOST_NO_RVALUE_REFERENCES
+# include <boost/type_traits/add_const.hpp>
+#endif
+=======
#ifdef BOOST_NO_RVALUE_REFERENCES
# include <boost/type_traits/add_const.hpp>
#endif
namespace boost { namespace fusion {
+>>>>>>> .r55867
- struct random_access_traversal_tag;
-
+namespace boost { namespace fusion
+{
namespace result_of
{
template <typename Seq, typename State, typename F>
@@ -64,7 +70,11 @@
BOOST_FUSION_R_ELSE_CLREF(Seq)
, BOOST_FUSION_R_ELSE_CLREF(State)
, BOOST_FUSION_R_ELSE_CLREF(F)
+<<<<<<< .mine
+ >::call(fusion::begin(BOOST_FUSION_FORWARD(Seq,seq)), state, f);
+=======
>::call(fusion::begin(seq), state, f);
+>>>>>>> .r55867
}
#ifdef BOOST_NO_RVALUE_REFERENCES
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/for_each.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/for_each.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/for_each.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -18,8 +18,6 @@
namespace boost { namespace fusion
{
- struct random_access_traversal_tag;
-
namespace result_of
{
template <typename Seq, typename>
@@ -52,7 +50,7 @@
inline typename result_of::for_each<Seq&,F const&>::type
for_each(Seq& seq,F const& f)
{
- detail::for_each_unrolled<result_of::size<Seq&>::value>::call(
+ detail::for_each_unrolled<result_of::size<Seq>::value>::call(
fusion::begin(seq),f);
}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/all.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/all.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/all.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -55,7 +55,7 @@
return
detail::unrolled_all<
result_of::size<Seq const&>::value
- >::call(fusion::begin(seq), f);
+ >::call(fusion::begin(BOOST_FUSION_FORWARD(Seq,seq)), f);
}
#endif
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/all.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/all.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/all.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -53,8 +53,8 @@
}
return unrolled_all<N-4>::call(
- fusion::next(it3)
- , BOOST_FUSION_FORWARD(F,f));
+ fusion::next(it3),
+ BOOST_FUSION_FORWARD(F,f));
}
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/find_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/find_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/detail/find_if.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -22,16 +22,15 @@
#include <boost/mpl/apply.hpp>
#include <boost/mpl/identity.hpp>
-namespace boost { namespace fusion {
- struct random_access_traversal_tag;
-
+namespace boost { namespace fusion
+{
namespace detail
{
template <typename Begin, typename End, typename Pred>
struct main_find_if;
template <typename Begin, typename End, typename Pred>
- struct recursive_find_if
+ struct next_find_if
: main_find_if<
typename result_of::next<Begin>::type
, End
@@ -47,15 +46,17 @@
, mpl::apply1<Pred,Begin>
>
, mpl::identity<Begin>
- , recursive_find_if<Begin, End, Pred>
+ , next_find_if<Begin, End, Pred>
>
{};
- template<typename Begin, typename End, typename Pred, bool>
- struct choose_find_if;
-
- template<typename Begin, typename End, typename Pred>
- struct choose_find_if<Begin, End, Pred, false>
+ template<
+ typename Begin
+ , typename End
+ , typename Pred
+ , bool /*IsRandomAccess=false*/
+ >
+ struct choose_find_if
: main_find_if<Begin, End, Pred>
{};
@@ -85,7 +86,7 @@
apply_offset_filter<It, Pred, 3>
, result_of::advance_c<It, 3>
, unroll_again<
- It
+ It
, Pred
, N
>
@@ -150,7 +151,7 @@
};
template<typename Begin, typename End, typename Pred>
- struct choose_find_if<Begin, End, Pred, true>
+ struct choose_find_if<Begin, End, Pred, /*IsRandomAccess*/true>
: unrolled_find_if<
Begin
, Pred
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -26,19 +26,14 @@
{
template <typename Seq, typename T>
struct find
+ : detail::static_seq_find_if<
+ typename begin<Seq>::type
+ , typename end<Seq>::type
+ , is_same<value_of<mpl::_1>, T>
+ >
{
BOOST_FUSION_MPL_ASSERT((traits::is_sequence<Seq>));
BOOST_FUSION_MPL_ASSERT((traits::is_forward<Seq>));
-
- typedef
- detail::static_seq_find_if<
- typename begin<Seq>::type
- , typename end<Seq>::type
- , is_same<value_of<mpl::_1>, T>
- >
- filter;
-
- typedef typename filter::type type;
};
}
@@ -47,11 +42,7 @@
result_of::find<BOOST_FUSION_R_ELSE_CLREF(Seq), T>::type const
find(BOOST_FUSION_R_ELSE_CLREF(Seq) seq)
{
- return
- result_of::find<
- BOOST_FUSION_R_ELSE_CLREF(Seq)
- , T
- >::filter::call(seq);
+ return result_of::find<BOOST_FUSION_R_ELSE_CLREF(Seq), T>::call(seq);
}
#ifdef BOOST_NO_RVALUE_REFERENCES
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -50,7 +50,11 @@
return
result_of::find_if<
BOOST_FUSION_R_ELSE_CLREF(Seq), Pred
+<<<<<<< .mine
+ >::call(fusion::begin(BOOST_FUSION_FORWARD(Seq,seq)));
+=======
>::call(fusion::begin(seq));
+>>>>>>> .r55867
}
#ifdef BOOST_NO_RVALUE_REFERENCES
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_key.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -25,19 +25,14 @@
{
template <typename Seq, typename T>
struct find_key
+ : detail::static_seq_find_if<
+ typename begin<Seq>::type
+ , typename end<Seq>::type
+ , is_same<key_of<mpl::_1>, T>
+ >
{
BOOST_FUSION_MPL_ASSERT((traits::is_sequence<Seq>));
BOOST_FUSION_MPL_ASSERT((traits::is_forward<Seq>));
-
- typedef
- detail::static_seq_find_if<
- typename begin<Seq>::type
- , typename end<Seq>::type
- , is_same<key_of<mpl::_1>, T>
- >
- filter;
-
- typedef typename filter::type type;
};
}
@@ -47,10 +42,7 @@
find_key(BOOST_FUSION_R_ELSE_CLREF(Seq) seq)
{
return
- result_of::find_key<
- BOOST_FUSION_R_ELSE_CLREF(Seq)
- , T
- >::filter::call(seq);
+ result_of::find_key<BOOST_FUSION_R_ELSE_CLREF(Seq), T>::call(seq);
}
#ifdef BOOST_NO_RVALUE_REFERENCES
@@ -59,7 +51,7 @@
result_of::find_key<,Seq,&, T>) const
find_key(Seq& seq)
{
- return result_of::find_key<Seq&, T>::filter::call(seq);
+ return result_of::find_key<Seq&, T>::call(seq);
}
#endif
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/erase.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -124,12 +124,12 @@
return result_type(
left_type(
- fusion::begin(seq)
+ fusion::begin(BOOST_FUSION_FORWARD(Seq,seq))
, first
)
, right_type(
last
- , fusion::end(seq)
+ , fusion::end(BOOST_FUSION_FORWARD(Seq,seq))
));
}
@@ -158,12 +158,12 @@
return result_type(
left_type(
- fusion::begin(seq)
+ fusion::begin(BOOST_FUSION_FORWARD(Seq,seq))
, first
)
, right_type(
last
- , fusion::end(seq)
+ , fusion::end(BOOST_FUSION_FORWARD(Seq,seq))
));
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/insert_range.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -79,7 +79,7 @@
return typename result::type(\
left_insert_type(\
left_type(\
- fusion::begin(seq),\
+ fusion::begin(BOOST_FUSION_FORWARD(Seq,seq)),\
pos\
),\
BOOST_FUSION_FORWARD(Range RANGE_CV_REF_MODIFIER,range)\
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_back.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_back.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_back.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -45,8 +45,8 @@
{
return typename
result_of::pop_back<BOOST_FUSION_R_ELSE_CLREF(Seq)>::type(
- fusion::begin(seq)
- , fusion::prior(fusion::end(seq)));
+ fusion::begin(BOOST_FUSION_FORWARD(Seq,seq))
+ , fusion::prior(fusion::end(BOOST_FUSION_FORWARD(Seq,seq))));
}
#ifdef BOOST_NO_RVALUE_REFERENCES
@@ -56,8 +56,8 @@
{
return typename
result_of::pop_back<Seq&>::type(
- fusion::begin(seq)
- , fusion::prior(fusion::end(seq)));
+ fusion::begin(BOOST_FUSION_FORWARD(Seq,seq))
+ , fusion::prior(fusion::end(BOOST_FUSION_FORWARD(Seq,seq))));
}
#endif
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_front.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_front.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/pop_front.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -46,7 +46,9 @@
return typename
result_of::pop_front<
BOOST_FUSION_R_ELSE_CLREF(Seq)
- >::type(fusion::next(fusion::begin(seq)), fusion::end(seq));
+ >::type(
+ fusion::next(fusion::begin(BOOST_FUSION_FORWARD(Seq,seq))),
+ fusion::end(BOOST_FUSION_FORWARD(Seq,seq)));
}
#ifdef BOOST_NO_RVALUE_REFERENCES
@@ -56,7 +58,8 @@
{
return typename
result_of::pop_front<Seq&>::type(
- fusion::next(fusion::begin(seq)), fusion::end(seq));
+ fusion::next(fusion::begin(BOOST_FUSION_FORWARD(Seq,seq))),
+ fusion::end(BOOST_FUSION_FORWARD(Seq,seq)));
}
#endif
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -36,6 +36,19 @@
{
typedef typename detail::remove_reference<Seq>::type seq;
+<<<<<<< .mine
+ typedef typename
+ mpl::apply1<
+ mpl::unpack_args<variadic_quote<BOOST_FUSION_SEQ_NAME> >
+ , typename mpl::eval_if<
+ traits::is_random_access<Seq>
+ , mpl::identity<seq>
+ , mpl::fold<
+ seq
+ , mpl::vector0<>
+ , mpl::quote2<mpl::push_back>
+ >
+=======
typedef typename
mpl::apply<
mpl::unpack_args<variadic_quote<BOOST_FUSION_SEQ_NAME> >
@@ -47,6 +60,7 @@
, mpl::vector0<>
, mpl::quote2<mpl::push_back>
>
+>>>>>>> .r55867
>::type
>::type
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/make_map.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -62,7 +62,7 @@
map_args;
typedef typename
- mpl::apply<
+ mpl::apply1<
mpl::unpack_args<detail::variadic_quote<map> >
, map_args
>::type
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/generation/detail/variadic_templates/map_tie.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -65,7 +65,7 @@
map_args;
typedef typename
- mpl::apply<
+ mpl::apply1<
mpl::unpack_args<detail::variadic_quote<map> >
, map_args
>::type
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,6 +1,7 @@
/*=============================================================================
Copyright (c) 2005 Joel de Guzman
Copyright (c) 2005 Eric Niebler
+ Copyright (c) 2009 Christopher Schmidt
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)
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/convert_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/convert_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/detail/cons/convert_impl.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -37,8 +37,8 @@
call(Seq seq)
{
return build_cons::call(
- fusion::begin(seq),
- fusion::end(seq));
+ fusion::begin(BOOST_FUSION_FORWARD(Seq,seq)),
+ fusion::end(BOOST_FUSION_FORWARD(Seq,seq)));
}
};
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -38,8 +38,13 @@
template <typename It, typename N>
struct advance
: extension::advance_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<void_>,It>::type
+ >::template apply<It,N>
+=======
typename mpl::apply<mpl::always<void_>,It>::type
>::template apply<It,N>
+>>>>>>> .r55867
{};
};
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/front.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/front.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/front.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -38,7 +38,7 @@
inline typename result_of::front<BOOST_FUSION_R_ELSE_CLREF(Seq)>::type
front(BOOST_FUSION_R_ELSE_CLREF(Seq) seq)
{
- return *fusion::begin(seq);
+ return *fusion::begin(BOOST_FUSION_FORWARD(Seq,seq));
}
#ifdef BOOST_NO_RVALUE_REFERENCES
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/sequence_facade.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -55,36 +55,61 @@
template<typename Seq,typename Key>
struct at_key
: extension::at_key_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<void_>,Seq>::type
+ >::template apply<Seq,Key>
+=======
typename mpl::apply<mpl::always<void_>,Seq>::type
>::template apply<Seq,Key>
+>>>>>>> .r55867
{};
template<typename Seq>
struct empty
: extension::empty_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<void_>,Seq>::type
+ >::template apply<Seq>
+=======
typename mpl::apply<mpl::always<void_>,Seq>::type
>::template apply<Seq>
+>>>>>>> .r55867
{};
template<typename Seq>
struct size
: extension::size_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<void_>,Seq>::type
+ >::template apply<Seq>
+=======
typename mpl::apply<mpl::always<void_>,Seq>::type
>::template apply<Seq>
+>>>>>>> .r55867
{};
template<typename Seq,typename Key>
struct has_key
: extension::has_key_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<void_>,Seq>::type
+ >::template apply<Seq,Key>
+=======
typename mpl::apply<mpl::always<void_>,Seq>::type
>::template apply<Seq,Key>
+>>>>>>> .r55867
{};
template<typename Seq,typename Key>
struct value_at_key
: extension::value_at_key_impl<
+<<<<<<< .mine
+ typename mpl::apply1<mpl::always<void_>,Seq>::type
+ >::template apply<Seq,Key>
+=======
typename mpl::apply<mpl::always<void_>,Seq>::type
>::template apply<Seq,Key>
+>>>>>>> .r55867
{};
};
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/internal/ref.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/internal/ref.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/internal/ref.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -24,12 +24,21 @@
#include <boost/type_traits/is_const.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/add_const.hpp>
+<<<<<<< .mine
+#ifndef BOOST_FUSION_NO_PROPAGATE_VOLATILE
+# include <boost/type_traits/is_volatile.hpp>
+# include <boost/type_traits/add_volatile.hpp>
+# include <boost/type_traits/remove_cv.hpp>
+#else
+# include <boost/type_traits/remove_const.hpp>
+=======
#ifdef BOOST_FUSION_PROPAGATE_VOLATILE
# include <boost/type_traits/is_volatile.hpp>
# include <boost/type_traits/add_volatile.hpp>
# include <boost/type_traits/remove_cv.hpp>
#else
# include <boost/type_traits/remove_const.hpp>
+>>>>>>> .r55867
#endif
//cschmidt: We ignore volatile in the BOOST_FUSION_ALL_CV_*-Macros, as we would
@@ -131,12 +140,21 @@
template <typename T>
struct identity
{
+<<<<<<< .mine
+ typedef typename
+#ifdef BOOST_FUSION_NO_PROPAGATE_VOLATILE
+ remove_const<
+#else
+ remove_cv<
+#endif
+=======
typedef typename
#ifdef BOOST_FUSION_PROPAGATE_VOLATILE
remove_cv<
#else
remove_const<
#endif
+>>>>>>> .r55867
typename remove_reference<T>::type
>::type
type;
@@ -153,7 +171,11 @@
, typename add_const<Type>::type
, Type
>::type
+<<<<<<< .mine
+#ifndef BOOST_FUSION_NO_PROPAGATE_VOLATILE
+=======
#ifdef BOOST_FUSION_PROPAGATE_VOLATILE
+>>>>>>> .r55867
const_type;
typedef typename
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/begin_impl.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -39,7 +39,7 @@
typename result<poly_begin(BOOST_FUSION_R_ELSE_LREF(Seq))>::type
operator()(BOOST_FUSION_R_ELSE_LREF(Seq) seq) const
{
- return fusion::begin(seq);
+ return fusion::begin(BOOST_FUSION_FORWARD(Seq,seq));
}
unused_type const&
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/detail/end_impl.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -52,7 +52,8 @@
typename result<endpoints(BOOST_FUSION_R_ELSE_LREF(Seq))>::type
operator()(BOOST_FUSION_R_ELSE_LREF(Seq) seq) const
{
- return fusion::advance<M>(fusion::begin(seq));
+ return fusion::advance<M>(
+ fusion::begin(BOOST_FUSION_FORWARD(Seq,seq)));
}
unused_type const&
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/Makefile
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/Makefile (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/Makefile 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,6 +1,6 @@
#=============================================================================
# Copyright (c) 2008 Dan Marsden
-#
+#
# Use modification and distribution are subject to 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).
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/driver.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/driver.hpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/driver.hpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,12 +1,12 @@
/*=============================================================================
Copyright (c) 2008 Dan Marsden
-
+
Use modification and distribution are subject to 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(BOOST_FUSION_COMPILE_TIME_DRIVER)
+#ifndef BOOST_FUSION_COMPILE_TIME_DRIVER
#define BOOST_FUSION_COMPILE_TIME_DRIVER
int main()
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/fold.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/fold.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/fold.cpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,6 +1,6 @@
/*=============================================================================
Copyright (c) 2008 Dan Marsden
-
+
Use modification and distribution are subject to 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).
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/transform.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/transform.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/transform.cpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,6 +1,6 @@
/*=============================================================================
Copyright (c) 2008 Dan Marsden
-
+
Use modification and distribution are subject to 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).
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_construction.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_construction.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_construction.cpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,6 +1,6 @@
/*=============================================================================
Copyright (c) 2008 Dan Marsden
-
+
Use modification and distribution are subject to 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).
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_intrinsic.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_intrinsic.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_intrinsic.cpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,6 +1,6 @@
/*=============================================================================
Copyright (c) 2008 Dan Marsden
-
+
Use modification and distribution are subject to 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).
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_iteration.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_iteration.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/compile_time/vector_iteration.cpp 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -1,6 +1,6 @@
/*=============================================================================
Copyright (c) 2008 Dan Marsden
-
+
Use modification and distribution are subject to 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).
Modified: sandbox/SOC/2009/fusion/project-root.jam
==============================================================================
--- sandbox/SOC/2009/fusion/project-root.jam (original)
+++ sandbox/SOC/2009/fusion/project-root.jam 2009-08-29 16:42:05 EDT (Sat, 29 Aug 2009)
@@ -13,8 +13,13 @@
: requirements <include>.
<include>$(BOOST_INCLUDES_PATH)
<define>BOOST_FUSION_ENABLE_STATIC_ASSERTS
+<<<<<<< .mine
+# <define>BOOST_FUSION_PREFER_MPL
+ <toolset>gcc:<cxxflags>-std=c++0x
+=======
# <define>BOOST_FUSION_PREFER_MPL
# <toolset>gcc:<cxxflags>-std=c++0x
+>>>>>>> .r55867
: build-dir ../bin
: default-build debug <link>shared <runtime-link>shared <threading>multi
;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk