merge from trunk

[SVN r61043]
This commit is contained in:
Christopher Schmidt
2010-04-04 14:43:54 +00:00
388 changed files with 6164 additions and 2576 deletions

View File

@ -32,9 +32,8 @@ namespace boost { namespace fusion { namespace detail
static bool
call(I1 const& a, I2 const& b, mpl::false_)
{
return *a > *b
|| !(*b > *a)
&& call(fusion::next(a), fusion::next(b));
return *a > *b ||
(!(*b > *a) && call(fusion::next(a), fusion::next(b)));
}
template <typename I1, typename I2>

View File

@ -32,9 +32,8 @@ namespace boost { namespace fusion { namespace detail
static bool
call(I1 const& a, I2 const& b, mpl::false_)
{
return *a < *b
|| !(*b < *a)
&& call(fusion::next(a), fusion::next(b));
return *a < *b ||
(!(*b < *a) && call(fusion::next(a), fusion::next(b)));
}
template <typename I1, typename I2>

View File

@ -17,7 +17,7 @@ namespace boost { namespace fusion
// Special tags:
struct sequence_facade_tag;
struct boost_tuple_tag; // boost::tuples::tuple tag
struct array_tag; // boost::array tag
struct boost_array_tag; // boost::array tag
struct mpl_sequence_tag; // mpl sequence tag
struct std_pair_tag; // std::pair tag
@ -41,7 +41,7 @@ namespace boost { namespace fusion
struct at_impl<boost_tuple_tag>;
template <>
struct at_impl<array_tag>;
struct at_impl<boost_array_tag>;
template <>
struct at_impl<mpl_sequence_tag>;

View File

@ -18,7 +18,7 @@ namespace boost { namespace fusion
{
// Special tags:
struct sequence_facade_tag;
struct array_tag; // boost::array tag
struct boost_array_tag; // boost::array tag
struct mpl_sequence_tag; // mpl sequence tag
struct std_pair_tag; // std::pair tag
@ -52,7 +52,7 @@ namespace boost { namespace fusion
};
template <>
struct at_key_impl<array_tag>;
struct at_key_impl<boost_array_tag>;
template <>
struct at_key_impl<mpl_sequence_tag>;

View File

@ -14,7 +14,7 @@ namespace boost { namespace fusion
// Special tags:
struct sequence_facade_tag; // iterator facade tag
struct boost_tuple_tag; // boost::tuples::tuple tag
struct array_tag; // boost::array tag
struct boost_array_tag; // boost::array tag
struct mpl_sequence_tag; // mpl sequence tag
struct std_pair_tag; // std::pair tag
@ -38,7 +38,7 @@ namespace boost { namespace fusion
struct begin_impl<boost_tuple_tag>;
template <>
struct begin_impl<array_tag>;
struct begin_impl<boost_array_tag>;
template <>
struct begin_impl<mpl_sequence_tag>;

View File

@ -14,7 +14,7 @@ namespace boost { namespace fusion
// Special tags:
struct sequence_facade_tag;
struct boost_tuple_tag; // boost::tuples::tuple tag
struct array_tag; // boost::array tag
struct boost_array_tag; // boost::array tag
struct mpl_sequence_tag; // mpl sequence tag
struct std_pair_tag; // std::pair tag
@ -38,7 +38,7 @@ namespace boost { namespace fusion
struct end_impl<boost_tuple_tag>;
template <>
struct end_impl<array_tag>;
struct end_impl<boost_array_tag>;
template <>
struct end_impl<mpl_sequence_tag>;

View File

@ -19,7 +19,7 @@ namespace boost { namespace fusion
// Special tags:
struct sequence_facade_tag;
struct array_tag; // boost::array tag
struct boost_array_tag; // boost::array tag
struct mpl_sequence_tag; // mpl sequence tag
struct std_pair_tag; // std::pair tag
@ -47,7 +47,7 @@ namespace boost { namespace fusion
};
template <>
struct has_key_impl<array_tag>;
struct has_key_impl<boost_array_tag>;
template <>
struct has_key_impl<mpl_sequence_tag>;

View File

@ -15,7 +15,7 @@ namespace boost { namespace fusion
// Special tags:
struct sequence_facade_tag;
struct boost_tuple_tag; // boost::tuples::tuple tag
struct array_tag; // boost::array tag
struct boost_array_tag; // boost::array tag
struct mpl_sequence_tag; // mpl sequence tag
struct std_pair_tag; // std::pair tag
@ -39,7 +39,7 @@ namespace boost { namespace fusion
struct size_impl<boost_tuple_tag>;
template <>
struct size_impl<array_tag>;
struct size_impl<boost_array_tag>;
template <>
struct size_impl<mpl_sequence_tag>;

View File

@ -15,7 +15,7 @@ namespace boost { namespace fusion
// Special tags:
struct sequence_facade_tag;
struct boost_tuple_tag; // boost::tuples::tuple tag
struct array_tag; // boost::array tag
struct boost_array_tag; // boost::array tag
struct mpl_sequence_tag; // mpl sequence tag
struct std_pair_tag; // std::pair tag
@ -39,7 +39,7 @@ namespace boost { namespace fusion
struct value_at_impl<boost_tuple_tag>;
template <>
struct value_at_impl<array_tag>;
struct value_at_impl<boost_array_tag>;
template <>
struct value_at_impl<mpl_sequence_tag>;

View File

@ -17,7 +17,7 @@ namespace boost { namespace fusion
{
// Special tags:
struct sequence_facade_tag;
struct array_tag; // boost::array tag
struct boost_array_tag; // boost::array tag
struct mpl_sequence_tag; // mpl sequence tag
struct std_pair_tag; // std::pair tag
@ -42,7 +42,7 @@ namespace boost { namespace fusion
};
template <>
struct value_at_key_impl<array_tag>;
struct value_at_key_impl<boost_array_tag>;
template <>
struct value_at_key_impl<mpl_sequence_tag>;