Subject: [Boost-commit] svn:boost r57157 - in sandbox/SOC/2009/fusion: . boost/fusion/algorithm/query boost/fusion/view/filter_view/detail boost/fusion/view/joint_view/detail boost/fusion/view/transform_view/detail libs/fusion/doc
From: mr.chr.schmidt_at_[hidden]
Date: 2009-10-25 19:27:53
Author: cschmidt
Date: 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
New Revision: 57157
URL: http://svn.boost.org/trac/boost/changeset/57157
Log:
minor bugfixes
Removed:
sandbox/SOC/2009/fusion/libs/fusion/doc/
Text files modified:
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find.hpp | 1 +
sandbox/SOC/2009/fusion/boost/fusion/algorithm/query/find_if.hpp | 1 +
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/begin_impl.hpp | 3 ++-
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp | 3 ++-
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/filter_view_iterator.hpp | 6 +++---
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/next_impl.hpp | 3 ++-
sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/begin_impl.hpp | 9 +++++++--
sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/end_impl.hpp | 7 ++++---
sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/joint_view_iterator.hpp | 12 ++++++------
sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/next_impl.hpp | 18 +++++++++++-------
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/transform_view_iterator.hpp | 2 +-
sandbox/SOC/2009/fusion/build.bat | 2 +-
12 files changed, 41 insertions(+), 26 deletions(-)
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-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -1,5 +1,6 @@
/*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman
+ 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/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-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -1,5 +1,6 @@
/*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman
+ 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/view/filter_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/begin_impl.hpp 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -26,7 +26,8 @@
typedef
filter_iterator<
- typename result_of::begin<typename seq::seq_type>::type
+ typename seq::category
+ , typename result_of::begin<typename seq::seq_type>::type
, typename result_of::end<typename seq::seq_type>::type
, typename seq::pred_type
>
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -25,7 +25,8 @@
typedef
filter_iterator<
- typename result_of::end<typename seq::seq_type>::type
+ typename seq::category
+ , typename result_of::end<typename seq::seq_type>::type
, typename result_of::end<typename seq::seq_type>::type
, typename seq::pred_type
>
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/filter_view_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/filter_view_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/filter_view_iterator.hpp 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -24,9 +24,9 @@
struct filter_view_iterator_tag;
struct forward_traversal_tag;
- template <typename Begin, typename End, typename Pred>
+ template <typename Category,typename Begin, typename End, typename Pred>
struct filter_iterator
- : iterator_base<filter_iterator<Begin, End, Pred> >
+ : iterator_base<filter_iterator<Category, Begin, End, Pred> >
{
typedef Pred pred_type;
typedef
@@ -43,7 +43,7 @@
typedef End end_type;
typedef filter_view_iterator_tag fusion_tag;
- typedef forward_traversal_tag category;
+ typedef Category category;
template<typename OtherIt>
filter_iterator(BOOST_FUSION_R_ELSE_CLREF(OtherIt) it)
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-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -35,7 +35,8 @@
typedef
filter_iterator<
- typename filter::type
+ typename it::category
+ , typename filter::type
, typename it::end_type
, typename it::pred_type
>
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/begin_impl.hpp 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -43,8 +43,13 @@
typedef typename
mpl::if_<
equal_to
- , concat_iterator<concat_type>
- , joint_view_iterator<begin_type, end_type, concat_type>
+ , concat_iterator<typename seq::category, concat_type>
+ , joint_view_iterator<
+ typename seq::category
+ , begin_type
+ , end_type
+ , concat_type
+ >
>::type
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/end_impl.hpp 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -24,11 +24,12 @@
template <typename Seq>
struct apply
{
+ typedef typename detail::remove_reference<Seq>::type seq;
+
typedef
concat_iterator<
- typename result_of::end<
- typename detail::remove_reference<Seq>::type::seq2_type
- >::type
+ typename seq::category
+ , typename result_of::end<typename seq::seq2_type>::type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/joint_view_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/joint_view_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/joint_view_iterator.hpp 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -18,12 +18,12 @@
struct concat_iterator_tag;
struct forward_traversal_tag;
- template <typename Begin, typename End, typename Concat>
+ template <typename Category, typename Begin, typename End, typename Concat>
struct joint_view_iterator
- : iterator_base<joint_view_iterator<Begin, End, Concat> >
+ : iterator_base<joint_view_iterator<Category, Begin, End, Concat> >
{
typedef joint_view_iterator_tag fusion_tag;
- typedef forward_traversal_tag category;
+ typedef Category category;
typedef Begin begin_type;
typedef End end_type;
@@ -38,14 +38,14 @@
concat_type concat;
};
- template <typename Begin>
+ template <typename Category, typename Begin>
struct concat_iterator
- : iterator_base<concat_iterator<Begin> >
+ : iterator_base<concat_iterator<Category, Begin> >
{
typedef Begin begin_type;
typedef concat_iterator_tag fusion_tag;
- typedef forward_traversal_tag category;
+ typedef Category category;
explicit
concat_iterator(Begin const& first)
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/next_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/next_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/joint_view/detail/next_impl.hpp 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -37,8 +37,13 @@
typedef typename
mpl::if_<
equal_to
- , concat_iterator<concat_type>
- , joint_view_iterator<next_type, end_type, concat_type>
+ , concat_iterator<typename it::category, concat_type>
+ , joint_view_iterator<
+ typename it::category
+ , next_type
+ , end_type
+ , concat_type
+ >
>::type
type;
@@ -68,13 +73,12 @@
template <typename It>
struct apply
{
+ typedef typename detail::remove_reference<It>::type it;
+
typedef
concat_iterator<
- typename result_of::next<
- typename detail::remove_reference<
- It
- >::type::begin_type
- >::type
+ typename it::category
+ , typename result_of::next<typename it::begin_type>::type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/transform_view_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/transform_view_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/transform_view_iterator.hpp 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -98,7 +98,7 @@
typedef transform_view_iterator2_tag fusion_tag;
typedef typename
mpl::eval_if<
- IsAssociative
+ is_associative
, mpl::inherit2<strictest_traversal,associative_sequence_tag>
, mpl::identity<strictest_traversal>
>::type
Modified: sandbox/SOC/2009/fusion/build.bat
==============================================================================
--- sandbox/SOC/2009/fusion/build.bat (original)
+++ sandbox/SOC/2009/fusion/build.bat 2009-10-25 19:27:51 EDT (Sun, 25 Oct 2009)
@@ -32,7 +32,7 @@
)
rem compile...
-%BOOST_ROOT%\bjam -sHOME="Z:\projekte\infrastructure\util\boost" --toolset=%TOOLSET% %2 %3 %4 %5 %6 %7 %8 %9
+%BOOST_ROOT%\bjam -sHOME="Z:\projekte\infrastructure\_gen\util\boost" --toolset=%TOOLSET% %2 %3 %4 %5 %6 %7 %8 %9
goto :eof
:gcc3