|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r55870 - in sandbox/SOC/2009/fusion: . boost/fusion/adapted/detail/mpl boost/fusion/algorithm/iteration boost/fusion/algorithm/query boost/fusion/container/detail/variadic_templates boost/fusion/iterator boost/fusion/sequence boost/fusion/support/internal boost/fusion/view/filter_view/detail
From: mr.chr.schmidt_at_[hidden]
Date: 2009-08-29 17:14:15
Author: cschmidt
Date: 2009-08-29 17:14:14 EDT (Sat, 29 Aug 2009)
New Revision: 55870
URL: http://svn.boost.org/trac/boost/changeset/55870
Log:
cleanup (2)
Text files modified:
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/mpl_iterator.hpp | 35 -----------------------------------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp | 12 ------------
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp | 2 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp | 4 ----
sandbox/SOC/2009/fusion/boost/fusion/container/detail/variadic_templates/as_seq.hpp | 14 --------------
sandbox/SOC/2009/fusion/boost/fusion/iterator/iterator_facade.hpp | 5 -----
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/filter_view/detail/next_impl.hpp | 2 +-
sandbox/SOC/2009/fusion/build.bat | 2 +-
sandbox/SOC/2009/fusion/project-root.jam | 5 -----
11 files changed, 3 insertions(+), 125 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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -60,85 +60,50 @@
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/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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -16,17 +16,9 @@
#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
namespace boost { namespace fusion
{
@@ -70,11 +62,7 @@
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/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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -51,7 +51,7 @@
result_of::find<,Seq,&, T>) const
find(Seq& seq)
{
- return result_of::find<Seq&, T>::filter::call(seq);
+ return result_of::find<Seq&, T>::call(seq);
}
#endif
}}
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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -50,11 +50,7 @@
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/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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -36,7 +36,6 @@
{
typedef typename detail::remove_reference<Seq>::type seq;
-<<<<<<< .mine
typedef typename
mpl::apply1<
mpl::unpack_args<variadic_quote<BOOST_FUSION_SEQ_NAME> >
@@ -48,19 +47,6 @@
, mpl::vector0<>
, mpl::quote2<mpl::push_back>
>
-=======
- typedef typename
- mpl::apply<
- 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>
- >
->>>>>>> .r55867
>::type
>::type
type;
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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -38,13 +38,8 @@
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/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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -55,61 +55,36 @@
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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -24,21 +24,12 @@
#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
@@ -140,21 +131,12 @@
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;
@@ -171,11 +153,7 @@
, 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/filter_view/detail/next_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/next_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/next_impl.hpp 2009-08-29 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -22,7 +22,7 @@
struct apply
{
typedef typename detail::remove_reference<It>::type it;
- typedef typename
+ typedef
detail::static_find_if<
typename result_of::next<typename it::begin_type>::type
, typename it::end_type
Modified: sandbox/SOC/2009/fusion/build.bat
==============================================================================
--- sandbox/SOC/2009/fusion/build.bat (original)
+++ sandbox/SOC/2009/fusion/build.bat 2009-08-29 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -22,7 +22,7 @@
call :gcc3
) else (
if "%1" == "" (
- call :gcc4
+ call :vc9
) else (
echo Unknown toolset '%1'
goto :eof
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 17:14:14 EDT (Sat, 29 Aug 2009)
@@ -13,13 +13,8 @@
: 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