Subject: [Boost-commit] svn:boost r55219 - in sandbox/SOC/2009/fusion: . boost/fusion/adapted/detail/boost_tuple boost/fusion/adapted/detail/mpl boost/fusion/adapted/detail/struct boost/fusion/algorithm/iteration boost/fusion/algorithm/transformation boost/fusion/container/list boost/fusion/container/map boost/fusion/container/map/detail/pp boost/fusion/container/set boost/fusion/container/vector/detail/pp boost/fusion/container/vector/detail/variadic_templates boost/fusion/functional/adapter boost/fusion/functional/adapter/detail/decltype_and_variadic_templates boost/fusion/iterator boost/fusion/sequence/intrinsic boost/fusion/support boost/fusion/support/detail boost/fusion/support/detail/iterator_adapter boost/fusion/tuple boost/fusion/view/detail boost/fusion/view/filter_view boost/fusion/view/filter_view/detail boost/fusion/view/reverse_view boost/fusion/view/reverse_view/detail boost/fusion/view/single_view boost/fusion/view/transform_view boost/fusion/view/transform_view/detail boost/fusion/view/zip_view libs/fusion/test libs/fusion/test/sequence
From: mr.chr.schmidt_at_[hidden]
Date: 2009-07-30 14:43:54
Author: cschmidt
Date: 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
New Revision: 55219
URL: http://svn.boost.org/trac/boost/changeset/55219
Log:
cleanup
Removed:
sandbox/SOC/2009/fusion/boost/fusion/support/detail/mpl_iterator_category.hpp
Text files modified:
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/end_impl.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/is_view_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/category_of_impl.hpp | 93 ++++++++++++++++++++++++++++++---------
sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/struct_iterator.hpp | 7 +-
sandbox/SOC/2009/fusion/boost/fusion/algorithm/iteration/fold.hpp | 7 +++
sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/transform.hpp | 7 +++
sandbox/SOC/2009/fusion/boost/fusion/container/list/cons.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/pp/lookup_key.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp | 10 +--
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/fused_impl.hpp | 7 --
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/unfused_impl.hpp | 6 -
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused_typed.hpp | 1
sandbox/SOC/2009/fusion/boost/fusion/iterator/equal_to.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp | 6 -
sandbox/SOC/2009/fusion/boost/fusion/support/detail/iterator_adapter/deref_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp | 18 +++++--
sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp | 27 +++++------
sandbox/SOC/2009/fusion/boost/fusion/support/tag_of.hpp | 11 ----
sandbox/SOC/2009/fusion/boost/fusion/support/tag_of_fwd.hpp | 7 --
sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp | 3
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/begin_impl.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/detail/end_impl.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp | 4
sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/begin_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/end_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp | 8 +-
sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/begin_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/end_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp | 2
sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp | 6 +-
sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp | 2
sandbox/SOC/2009/fusion/build.bat | 2
sandbox/SOC/2009/fusion/libs/fusion/test/CMakeLists.txt | 6 ++
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp | 5 -
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/misc.hpp | 2
sandbox/SOC/2009/fusion/libs/fusion/test/sequence/tr1_tuple_auto_conv.cpp | 11 ++--
sandbox/SOC/2009/fusion/project-root.jam | 1
47 files changed, 179 insertions(+), 139 deletions(-)
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/end_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -26,7 +26,6 @@
boost_tuple_iterator<tuples::null_type const volatile&>
type;
- //TODO volatile!
template<typename Seq>
static type
call(Seq const& seq, mpl::true_)
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/is_view_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/is_view_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/boost_tuple/is_view_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -10,8 +10,6 @@
#include <boost/mpl/bool.hpp>
-//TODO: implement through is_sequence
-
namespace boost { namespace fusion { namespace extension
{
template<typename Tag>
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/category_of_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/category_of_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/mpl/category_of_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -8,34 +8,85 @@
#ifndef BOOST_FUSION_ADAPTED_DETAIL_MPL_CATEGORY_OF_IMPL_HPP
#define BOOST_FUSION_ADAPTED_DETAIL_MPL_CATEGORY_OF_IMPL_HPP
-
-//TODO make detail the very last include
-#include <boost/fusion/support/detail/mpl_iterator_category.hpp>
-
#include <boost/mpl/begin.hpp>
#include <boost/mpl/is_sequence.hpp>
-namespace boost { namespace fusion { namespace extension
+namespace boost { namespace mpl
+{
+ struct forward_iterator_tag;
+ struct bidirectional_iterator_tag;
+ struct random_access_iterator_tag;
+}}
+
+namespace boost { namespace fusion
{
- template<typename Tag>
- struct category_of_impl;
+ struct forward_traversal_tag;
+ struct bidirectional_traversal_tag;
+ struct random_access_traversal_tag;
- template<>
- struct category_of_impl<mpl_sequence_tag>
+ namespace detail
{
- template<typename SeqRef>
- struct apply
+ template <typename Category>
+ struct mpl_iterator_category;
+
+ template <>
+ struct mpl_iterator_category<mpl::forward_iterator_tag>
+ {
+ typedef forward_traversal_tag type;
+ };
+
+ template <>
+ struct mpl_iterator_category<mpl::bidirectional_iterator_tag>
+ {
+ typedef bidirectional_traversal_tag type;
+ };
+
+ template <>
+ struct mpl_iterator_category<mpl::random_access_iterator_tag>
+ {
+ typedef random_access_traversal_tag type;
+ };
+
+ template <>
+ struct mpl_iterator_category<forward_traversal_tag>
+ {
+ typedef forward_traversal_tag type;
+ };
+
+ template <>
+ struct mpl_iterator_category<bidirectional_traversal_tag>
+ {
+ typedef bidirectional_traversal_tag type;
+ };
+
+ template <>
+ struct mpl_iterator_category<random_access_traversal_tag>
+ {
+ typedef random_access_traversal_tag type;
+ };
+ }
+
+ namespace extension
+ {
+ template<typename Tag>
+ struct category_of_impl;
+
+ template<>
+ struct category_of_impl<mpl_sequence_tag>
{
- //TODO get_category?
- typedef typename
- detail::mpl_iterator_category<
- typename mpl::begin<
- typename detail::identity<SeqRef>::type
- >::type::category
- >::type
- type;
+ template<typename SeqRef>
+ struct apply
+ {
+ typedef typename
+ detail::mpl_iterator_category<
+ typename mpl::begin<
+ typename detail::identity<SeqRef>::type
+ >::type::category
+ >::type
+ type;
+ };
};
- };
-}}}
+ }
+}}
#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/struct_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/struct_iterator.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/adapted/detail/struct/struct_iterator.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -12,8 +12,6 @@
#include <boost/fusion/support/assert.hpp>
#include <boost/fusion/iterator/iterator_facade.hpp>
-#include <boost/type_traits/is_const.hpp>
-#include <boost/type_traits/add_reference.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/int.hpp>
@@ -26,7 +24,10 @@
template <typename SeqRef, int Pos>
struct struct_iterator
- : iterator_facade<struct_iterator<SeqRef, Pos>, random_access_traversal_tag>
+ : iterator_facade<
+ struct_iterator<SeqRef, Pos>
+ , random_access_traversal_tag
+ >
{
//BOOST_FUSION_INDEX_CHECK(N,struct_size<SeqRef>::value);
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-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -64,8 +64,15 @@
State const& state,
F const& f)
{
+#ifdef BOOST_MSVC
+# pragma warning(push)
+# pragma warning(disable: 4180)
+#endif
return result_of::fold<Seq&,State const&,F const&>::gen::call(
fusion::begin(seq), state, f);
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
}
#endif
}}
Modified: sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/transform.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/transform.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/algorithm/transformation/transform.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -55,7 +55,14 @@
inline typename result_of::transform<Seq&, F const&>::type
transform(Seq& seq, F const& f)
{
+#ifdef BOOST_MSVC
+# pragma warning(push)
+# pragma warning(disable: 4180)
+#endif
return typename result_of::transform<Seq&, F const&>::type(seq, f);
+#ifdef BOOST_MSVC
+# pragma warning(pop)
+#endif
}
#endif
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-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -113,7 +113,7 @@
BOOST_FUSION_FORWARD(cons COMBINATION,cons_))))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(CONS_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(CONS_CTOR,_);
#undef CONS_CTOR
@@ -144,7 +144,7 @@
fusion::next(fusion::begin(seq_assign.get())))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(CONS_ASSIGN_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(CONS_ASSIGN_CTOR,_);
#undef CONS_ASSIGN_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/list/list.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -51,7 +51,7 @@
: data(BOOST_FUSION_FORWARD(list COMBINATION,list_).data)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(LIST_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(LIST_CTOR,_)
#undef LIST_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/pp/lookup_key.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/pp/lookup_key.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/detail/pp/lookup_key.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -8,7 +8,7 @@
#ifndef BOOST_FUSION_CONTAINER_MAP_DETAIL_PP_LOOKUP_KEY_HPP
#define BOOST_FUSION_CONTAINER_MAP_DETAIL_PP_LOOKUP_KEY_HPP
-#include <boost/type_traits/add_reference.hpp>
+#include <boost/fusion/support/ref.hpp>
#include <boost/fusion/support/detail/pp/unknown_key.hpp>
namespace boost { namespace fusion
@@ -22,7 +22,7 @@
struct map_data_type
{
typedef typename
- add_reference<
+ detail::add_lref<
typename T::second_type
>::type
type;
@@ -38,7 +38,7 @@
struct map_const_data_type
{
typedef typename
- add_reference<
+ detail::add_lref<
typename add_const<
typename T::second_type
>::type
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/map/map.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -141,7 +141,7 @@
: data(BOOST_FUSION_FORWARD(map COMBINATION,map_).data)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MAP_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(MAP_CTOR,_)
#undef MAP_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/set/set.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -111,7 +111,7 @@
: data(BOOST_FUSION_FORWARD(set COMBINATION,set_).data)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(SET_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(SET_CTOR,_)
#undef SET_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -12,7 +12,6 @@
#include <boost/mpl/at.hpp>
#include <boost/mpl/bool.hpp>
-#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/fusion/container/detail/pp/forward_ctor.hpp>
@@ -48,7 +47,7 @@
: data(BOOST_FUSION_FORWARD(self_type COMBINATION,vec).data)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VECTOR_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_);
#undef VECTOR_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/pp/vector_n.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -87,7 +87,6 @@
# undef BOOST_FUSION_DEFAULT_MEMBER_INIT
- //TODO macro names
# if N
# define BOOST_FUSION_SELF_TYPE\
BOOST_PP_CAT(vector, N)<BOOST_PP_ENUM_PARAMS(N,T)>
@@ -103,7 +102,7 @@
: BOOST_PP_ENUM(N, BOOST_FUSION_MEMBER_INIT, COMBINATION)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VECTOR_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_)
# undef BOOST_FUSION_MEMBER_INIT
# undef BOOST_FUSION_SELF_TYPE
@@ -112,7 +111,7 @@
BOOST_PP_CAT(vector, N)(BOOST_PP_CAT(vector, N)<void_> COMBINATION vec)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VECTOR_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_)
# endif
# undef VECTOR_CTOR
@@ -158,7 +157,7 @@
: BOOST_PP_ENUM(N, BOOST_FUSION_MEMBER_INIT, _)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
# undef VECTOR_ASSIGN_CTOR
# undef BOOST_FUSION_MEMBER_INIT
@@ -169,7 +168,7 @@
support::sequence_assign_type<SeqRef> COMBINATION seq_assign)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
# undef VECTOR_ASSIGN_CTOR
# endif
@@ -233,7 +232,6 @@
return at_impl(mpl::int_<I::value>());
}
- //TODO: no add_reference
# define BOOST_FUSION_MEMBER_DECL(Z, N, _)\
typename detail::add_lref<BOOST_PP_CAT(T,N)>::type\
at_impl(mpl::int_<N>)\
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -142,7 +142,7 @@
fusion::begin(BOOST_FUSION_FORWARD(vector COMBINATION,vec)))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VECTOR_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_)
#undef VECTOR_CTOR
@@ -159,7 +159,7 @@
: base(detail::assign_by_deref(),fusion::begin(seq_assign.get()))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_ASSIGN_CTOR,_);
#undef VECTOR_ASSIGN_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/container/vector/detail/variadic_templates/vector_n.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -49,7 +49,7 @@
BOOST_FUSION_FORWARD(BOOST_PP_CAT(vector, N) COMBINATION,vec)))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VECTOR_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VECTOR_CTOR,_)
# undef VECTOR_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/fused_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/fused_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/fused_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -28,7 +28,7 @@
: f(std::forward<BOOST_FUSION_ADAPTER_NAME COMBINATION>(adapter).f)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(CTOR_SPECIALIZATION,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(CTOR_SPECIALIZATION,_)
#undef CTOR_SPECIALIZATION
@@ -49,7 +49,7 @@
return *this;\
}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(ASSIGN_SPECIALIZATION,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(ASSIGN_SPECIALIZATION,_)
#undef ASSIGN_SPECIALIZATION
@@ -67,9 +67,6 @@
CALL_OPERATOR(BOOST_PP_EMPTY());
CALL_OPERATOR(const);
- //TODO !!!
- //CALL_OPERATOR(volatile);
- //CALL_OPERATOR(const volatile);
#undef CALL_OPERATOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/unfused_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/unfused_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/detail/decltype_and_variadic_templates/unfused_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -46,7 +46,7 @@
: f(std::forward<BOOST_FUSION_ADAPTER_NAME COMBINATION>(adapter).f)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(CTOR_SPECIALIZATION,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(CTOR_SPECIALIZATION,_)
#undef CTOR_SPECIALIZATION
@@ -67,7 +67,7 @@
return *this;\
}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(ASSIGN_SPECIALIZATION,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(ASSIGN_SPECIALIZATION,_)
#undef ASSIGN_SPECIALIZATION
@@ -100,8 +100,6 @@
CALL_OPERATOR(BOOST_PP_EMPTY());
CALL_OPERATOR(const);
- CALL_OPERATOR(volatile);
- CALL_OPERATOR(const volatile);
#undef CALL_OPERATOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -7,7 +7,6 @@
#define BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_HPP
#include <boost/config.hpp>
-//TODO cschmidt!!!
#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)// || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
# include <boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates/unfused.hpp>
#else
Modified: sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused_typed.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused_typed.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/functional/adapter/unfused_typed.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -7,7 +7,6 @@
#define BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_TYPED_HPP
#include <boost/config.hpp>
-//TODO cschmidt!!!
#if defined(BOOST_NO_DECLTYPE) || defined(BOOST_NO_VARIADIC_TEMPLATES)// || !defined(BOOST_FUSION_CPP0X_NO_DEPRECEATED)
# include <boost/fusion/functional/adapter/detail/no_decltype_or_variadic_templates/unfused_typed.hpp>
#else
Modified: sandbox/SOC/2009/fusion/boost/fusion/iterator/equal_to.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/iterator/equal_to.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/iterator/equal_to.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -21,8 +21,6 @@
namespace extension
{
- //TODO: doc no default any more!
-
template <typename Tag>
struct equal_to_impl;
Modified: sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/sequence/intrinsic/swap.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -11,7 +11,7 @@
#include <boost/config.hpp>
#ifdef BOOST_NO_RVALUE_REFERENCES
-# include <boost/fusion/view/zip_view.hpp>
+# include <boost/fusion/algorithm/transformation/zip.hpp>
# include <boost/fusion/algorithm/iteration/for_each.hpp>
# include <boost/fusion/sequence/intrinsic/front.hpp>
# include <boost/fusion/sequence/intrinsic/back.hpp>
@@ -50,9 +50,7 @@
void
swap(Seq1& seq1, Seq2& seq2)
{
- //TODO zip()
- typedef vector<Seq1&, Seq2&> references;
- for_each(zip_view<references>(references(seq1, seq2)), detail::swap());
+ for_each(zip(seq1, seq2), detail::swap());
}
#else
using std::swap;
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/detail/iterator_adapter/deref_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/detail/iterator_adapter/deref_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/detail/iterator_adapter/deref_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -8,8 +8,6 @@
#include <boost/fusion/iterator/deref.hpp>
-//TODO seq_type -> sequence_type
-
namespace boost { namespace fusion { namespace extension
{
template <typename Tag>
Deleted: sandbox/SOC/2009/fusion/boost/fusion/support/detail/mpl_iterator_category.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/detail/mpl_iterator_category.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
+++ (empty file)
@@ -1,70 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2006 Joel de Guzman
-
- 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)
-==============================================================================*/
-
-#ifndef BOOST_FUSION_SUPPORT_DETAIL_MPL_ITERATOR_CATEGORY_HPP
-#define BOOST_FUSION_SUPPORT_DETAIL_MPL_ITERATOR_CATEGORY_HPP
-
-namespace boost
-{
- namespace mpl
- {
- struct forward_iterator_tag;
- struct bidirectional_iterator_tag;
- struct random_access_iterator_tag;
- }
-
- namespace fusion
- {
- struct forward_traversal_tag;
- struct bidirectional_traversal_tag;
- struct random_access_traversal_tag;
- }
-
- namespace fusion { namespace detail
- {
- template <typename Category>
- struct mpl_iterator_category;
-
- template <>
- struct mpl_iterator_category<mpl::forward_iterator_tag>
- {
- typedef forward_traversal_tag type;
- };
-
- template <>
- struct mpl_iterator_category<mpl::bidirectional_iterator_tag>
- {
- typedef bidirectional_traversal_tag type;
- };
-
- template <>
- struct mpl_iterator_category<mpl::random_access_iterator_tag>
- {
- typedef random_access_traversal_tag type;
- };
-
- template <>
- struct mpl_iterator_category<forward_traversal_tag>
- {
- typedef forward_traversal_tag type;
- };
-
- template <>
- struct mpl_iterator_category<bidirectional_traversal_tag>
- {
- typedef bidirectional_traversal_tag type;
- };
-
- template <>
- struct mpl_iterator_category<random_access_traversal_tag>
- {
- typedef random_access_traversal_tag type;
- };
- }}
-}
-
-#endif
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/pair.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -31,7 +31,7 @@
.second)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(PAIR_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(PAIR_CTOR,_)
#undef PAIR_CTOR
@@ -107,8 +107,10 @@
}
template <typename OStream, typename First, typename Second>
- inline OStream&
- operator<<(OStream& os, pair<First, Second> const& p)
+ inline BOOST_FUSION_R_ELSE_LREF(OStream)
+ operator<<(
+ BOOST_FUSION_R_ELSE_LREF(OStream) os,
+ pair<First, Second> const& p)
{
os << p.second;
return os;
@@ -116,10 +118,14 @@
//TODO cschmidt: rref?!
template <typename IStream, typename First, typename Second>
- inline IStream&
- operator>>(IStream& is, pair<First, Second> p)
+ inline BOOST_FUSION_R_ELSE_LREF(IStream)
+ operator>>(
+ BOOST_FUSION_R_ELSE_LREF(IStream) is
+#define BOOST_FUSION_ARG pair<First, Second>
+ , BOOST_FUSION_R_ELSE_LREF(BOOST_FUSION_ARG) p)
{
- is >> p.second;
+ is >> BOOST_FUSION_FORWARD(BOOST_FUSION_ARG,p).second;
+#undef BOOST_FUSION_ARG
return is;
}
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/ref.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -32,6 +32,10 @@
#include <boost/type_traits/remove_const.hpp>
#include <boost/type_traits/remove_cv.hpp>
+//cschmidt: We ignore volatile in the BOOST_FUSION_ALL_CV_*-Macros, as we would
+//get a lot of problems with older compilers. On top of that, fusion
+//types are not meant to be volatile anyway.
+
#ifdef BOOST_NO_RVALUE_REFERENCES
# include <boost/mpl/bool.hpp>
@@ -43,12 +47,11 @@
# define BOOST_FUSION_FORWARD(TYPE,ARGUMENT) ARGUMENT
-# define BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)\
- MACRO(&,ARG)\
+# define BOOST_FUSION_ALL_CTOR_COMBINATIONS(MACRO,ARG)\
MACRO(const&,ARG)
-
- //MACRO(volatile&,ARG)\
- //MACRO(const volatile&,ARG)
+# define BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)\
+ MACRO(const&,ARG)\
+ MACRO(&,ARG)
#else
# include <utility>
@@ -60,26 +63,22 @@
# define BOOST_FUSION_FORWARD(TYPE,ARGUMENT) std::forward<TYPE>(ARGUMENT)
- //cschmidt: This macro could be workaround with a single function using
+ //cschmidt: InstThis macro could be replaced with a single function using
//enable if and is_convertible. This is a lot slower than five overloads/
//specialisations though.
+# define BOOST_FUSION_ALL_CTOR_COMBINATIONS(MACRO,ARG)\
+ BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)
+
# define BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)\
MACRO(&,ARG)\
MACRO(const&,ARG)\
MACRO(&&,ARG)\
MACRO(const&&,ARG)
-
- //MACRO(volatile&,ARG)\
- //MACRO(const volatile&,ARG)\
- //MACRO(volatile&&,ARG)\
- //MACRO(const volatile&&,ARG)
#endif
#define BOOST_FUSION_ALL_CV_REF_NON_REF_COMBINATIONS(MACRO,ARG)\
BOOST_FUSION_ALL_CV_REF_COMBINATIONS(MACRO,ARG)\
MACRO(BOOST_PP_EMPTY(),ARG)\
- MACRO(const,ARG)\
- MACRO(volatile,ARG)\
- MACRO(const volatile,ARG)
+ MACRO(const,ARG)
namespace boost { namespace fusion { namespace detail
{
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/tag_of.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/tag_of.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/tag_of.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -34,14 +34,6 @@
{
typedef typename Seq::fusion_tag type;
};
-
- template <typename Seq>
- struct is_mpl_sequence
- : mpl::and_<
- mpl::not_<is_base_of<sequence_root, Seq> >
- , mpl::is_sequence<Seq>
- >
- {};
}
namespace traits
@@ -56,8 +48,7 @@
detail::has_fusion_tag<seq>
, detail::get_fusion_tag<seq>
, mpl::if_<
- //???
- detail::is_mpl_sequence<seq>
+ mpl::is_sequence<seq>
, mpl_sequence_tag
, mpl_iterator_tag
>
Modified: sandbox/SOC/2009/fusion/boost/fusion/support/tag_of_fwd.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/support/tag_of_fwd.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/support/tag_of_fwd.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -9,12 +9,7 @@
#ifndef BOOST_FUSION_SUPPORT_TAG_OF_FWD_HPP
#define BOOST_FUSION_SUPPORT_TAG_OF_FWD_HPP
-//TODO:really needed?
-
-#include <boost/fusion/support/ref.hpp>
-
-#include <boost/mpl/has_xxx.hpp>
-
+//cschmidt: only provided for backwards compatibility
namespace boost { namespace fusion
{
namespace traits
Modified: sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/tuple/tuple.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -46,7 +46,7 @@
static_cast<std::pair<A1, A2> COMBINATION>(pair)))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(TUPLE_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(TUPLE_CTOR,_)
#undef TUPLE_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/detail/view_storage.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -68,7 +68,7 @@
: t(get_init_type(storage.get()))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(VIEW_STORAGE_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(VIEW_STORAGE_CTOR,_)
#undef VIEW_STORAGE_CTOR
@@ -91,7 +91,6 @@
return *this;
}
- //TODO cschmidt: volatile?
typename mpl::if_<
traits::is_view<T>
, typename detail::add_lref<type>::type
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-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -26,8 +26,8 @@
typedef
filter_iterator<
- typename result_of::begin<typename seq::seq_type>::type
- , typename result_of::end<typename seq::seq_type>::type
+ typename result_of::begin<typename seq::sequence_type>::type
+ , typename result_of::end<typename seq::sequence_type>::type
, typename seq::pred_type
>
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-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -25,8 +25,8 @@
typedef
filter_iterator<
- typename result_of::end<typename seq::seq_type>::type
- , typename result_of::end<typename seq::seq_type>::type
+ typename result_of::end<typename seq::sequence_type>::type
+ , typename result_of::end<typename seq::sequence_type>::type
, typename seq::pred_type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/filter_view/filter_view.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -43,7 +43,7 @@
typedef mpl::true_ is_view;
typedef detail::view_storage<Seq> storage_type;
- typedef typename storage_type::type seq_type;
+ typedef typename storage_type::type sequence_type;
typedef Pred pred_type;
#define FILTER_VIEW_CTOR(COMBINATION,_)\
@@ -52,7 +52,7 @@
: seq(static_cast<filter_view<OtherSeq, Pred> COMBINATION>(view).seq)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(FILTER_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(FILTER_VIEW_CTOR,_)
#undef FILTER_VIEW_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/begin_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -26,7 +26,7 @@
typename result_of::end<
typename detail::remove_reference<
SeqRef
- >::type::seq_type
+ >::type::sequence_type
>::type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/detail/end_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -26,7 +26,7 @@
typename result_of::begin<
typename detail::remove_reference<
SeqRef
- >::type::seq_type
+ >::type::sequence_type
>::type
>
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/reverse_view/reverse_view.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -46,9 +46,9 @@
typedef mpl::true_ is_view;
typedef detail::view_storage<Seq> storage_type;
- typedef typename storage_type::type seq_type;
- typedef typename traits::category_of<seq_type>::type category;
- typedef typename result_of::size<seq_type>::type size;
+ typedef typename storage_type::type sequence_type;
+ typedef typename traits::category_of<sequence_type>::type category;
+ typedef typename result_of::size<sequence_type>::type size;
//BOOST_FUSION_STATIC_ASSERT(
// (is_base_of<bidirectional_traversal_tag,
@@ -62,7 +62,7 @@
reverse_view<OtherSeq> COMBINATION,view).seq)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(REVERSE_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(REVERSE_VIEW_CTOR,_)
#undef REVERSE_VIEW_CTOR
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/single_view/single_view.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -52,7 +52,7 @@
: val(BOOST_FUSION_FORWARD(single_view COMBINATION,view).val)\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(SINGLE_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(SINGLE_VIEW_CTOR,_)
#undef SINGLE_VIEW_CTOR
@@ -68,7 +68,7 @@
: val(fusion::front(seq_assign.get()))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(SINGLE_VIEW_ASSIGN_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(SINGLE_VIEW_ASSIGN_CTOR,_)
#undef SINGLE_VIEW_ASSIGN_CTOR
@@ -89,7 +89,7 @@
return *this;\
}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(SINGLE_VIEW_SEQ_ASSIGN,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(SINGLE_VIEW_SEQ_ASSIGN,_)
#undef SINGLE_VIEW_SEQ_ASSIGN
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/at_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -30,7 +30,7 @@
typename support::get_func_base<
typename seq::transform_type
>::type(
- typename result_of::at<typename seq::seq_type, N>::type
+ typename result_of::at<typename seq::sequence_type, N>::type
)
>::type
type;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/begin_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/begin_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/begin_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -28,7 +28,7 @@
typedef
transform_view_iterator<
- typename result_of::begin<typename seq::seq_type>::type
+ typename result_of::begin<typename seq::sequence_type>::type
, typename detail::forward_as<
SeqRef
, typename seq::transform_type
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/end_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/end_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/end_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -26,7 +26,7 @@
typedef
transform_view_iterator<
- typename result_of::end<typename seq::seq_type>::type
+ typename result_of::end<typename seq::sequence_type>::type
, typename detail::forward_as<
SeqRef
, typename seq::transform_type
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/detail/value_at_impl.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -31,7 +31,7 @@
typename seq::transform_type
>::type(
typename boost::fusion::result_of::value_at<
- typename seq::seq_type
+ typename seq::sequence_type
, N
>::type)
>::type
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/transform_view/transform_view.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -131,11 +131,11 @@
#endif
{
typedef detail::view_storage<Seq> storage_type;
- typedef typename storage_type::type seq_type;
+ typedef typename storage_type::type sequence_type;
typedef F transform_type;
- typedef typename traits::category_of<seq_type>::type category;
- typedef typename result_of::size<seq_type>::type size;
+ typedef typename traits::category_of<sequence_type>::type category;
+ typedef typename result_of::size<sequence_type>::type size;
typedef transform_view_tag fusion_tag;
typedef fusion_sequence_tag tag; // this gets picked up by MPL
typedef mpl::true_ is_view;
Modified: sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp (original)
+++ sandbox/SOC/2009/fusion/boost/fusion/view/zip_view/zip_view.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -152,7 +152,7 @@
zip_view<OtherSeqs> COMBINATION,view).seqs))\
{}
- BOOST_FUSION_ALL_CV_REF_COMBINATIONS(ZIP_VIEW_CTOR,_)
+ BOOST_FUSION_ALL_CTOR_COMBINATIONS(ZIP_VIEW_CTOR,_)
#undef ZIP_VIEW_CTOR
Modified: sandbox/SOC/2009/fusion/build.bat
==============================================================================
--- sandbox/SOC/2009/fusion/build.bat (original)
+++ sandbox/SOC/2009/fusion/build.bat 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -16,7 +16,7 @@
call :msvc
) else (
if "%1" == "" (
- call :msvc
+ call :gcc
) else (
echo Unknown toolset '%1'
goto :eof
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/CMakeLists.txt
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/CMakeLists.txt (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/CMakeLists.txt 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -1,3 +1,9 @@
+#
+# Copyright Troy D. Straszheim
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
#----------------------------------------------------------------------------
# This file was automatically generated from the original CMakeLists.txt file
# Add a variable to hold the headers for the library
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/adapt_assoc_struct.cpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -120,9 +120,8 @@
BOOST_MPL_ASSERT((fusion::result_of::has_key<ns::point, ns::y_member>));
BOOST_MPL_ASSERT((mpl::not_<fusion::result_of::has_key<ns::point, ns::z_member> >));
- //TODO???
- //BOOST_MPL_ASSERT(( is_same<fusion::result_of::value_at_key<ns::point, ns::x_member>::type, int> ));
- //BOOST_MPL_ASSERT(( is_same<fusion::result_of::value_at_key<ns::point, ns::y_member>::type, int> ));
+ BOOST_MPL_ASSERT(( boost::is_same<fusion::result_of::value_at_key<ns::point, ns::x_member>::type, int> ));
+ BOOST_MPL_ASSERT(( boost::is_same<fusion::result_of::value_at_key<ns::point, ns::y_member>::type, int> ));
ns::point p = {5, 3};
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/misc.hpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/misc.hpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/misc.hpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -157,7 +157,7 @@
{ // testing front & back
typedef FUSION_SEQUENCE<int, float, std::string> tup;
- tup t(1, 2.2, "Kimpo");
+ tup t(1, 2.2f, "Kimpo");
BOOST_TEST(front(t) == 1);
BOOST_TEST(back(t) == "Kimpo");
Modified: sandbox/SOC/2009/fusion/libs/fusion/test/sequence/tr1_tuple_auto_conv.cpp
==============================================================================
--- sandbox/SOC/2009/fusion/libs/fusion/test/sequence/tr1_tuple_auto_conv.cpp (original)
+++ sandbox/SOC/2009/fusion/libs/fusion/test/sequence/tr1_tuple_auto_conv.cpp 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -1,11 +1,10 @@
-// Copyright Christopher Schmidt 2009.
-// 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)
+/*=============================================================================
+ Copyright (c) 2008 Joel de Guzman
-//TODO Authors???
+ 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)
+==============================================================================*/
-//TODO!!!
#include <boost/tr1/memory.hpp>
#include <boost/tr1/tuple.hpp>
#include <boost/any.hpp>
Modified: sandbox/SOC/2009/fusion/project-root.jam
==============================================================================
--- sandbox/SOC/2009/fusion/project-root.jam (original)
+++ sandbox/SOC/2009/fusion/project-root.jam 2009-07-27 21:50:36 EDT (Mon, 27 Jul 2009)
@@ -16,7 +16,6 @@
<toolset>gcc-conceptgcc:<include>workaround/conceptgcc
<include>$(BOOST_INCLUDES_PATH)
<toolset>gcc:<cxxflags>-std=c++0x
- <toolset>msvc:<cxxflags>/w
: build-dir ../bin
: default-build debug <link>shared <runtime-link>shared <threading>multi
;