merge from trunk

[SVN r56178]
This commit is contained in:
Joel de Guzman
2009-09-14 07:40:39 +00:00
parent ea5ea7f001
commit 2f8b91828b
22 changed files with 295 additions and 51 deletions

View File

@ -87,6 +87,18 @@ namespace boost { namespace fusion { namespace traits
// Keep references on arrays, even if const
template <typename T, int N>
struct deduce<T(&)[N]>
{
typedef T(&type)[N];
};
template <typename T, int N>
struct deduce<volatile T(&)[N]>
{
typedef volatile T(&type)[N];
};
template <typename T, int N>
struct deduce<const T(&)[N]>
{

View File

@ -85,11 +85,11 @@ namespace boost { namespace fusion
{
template <typename Sequence, typename Active>
struct tag_of
: mpl::if_< detail::is_mpl_sequence<Sequence>,
: mpl::if_< fusion::detail::is_mpl_sequence<Sequence>,
mpl::identity<mpl_sequence_tag>,
mpl::identity<non_fusion_tag> >::type
{
BOOST_MPL_ASSERT_NOT((detail::is_specialized<Sequence>));
BOOST_MPL_ASSERT_NOT((fusion::detail::is_specialized<Sequence>));
};
template <typename Sequence>

View File

@ -1,7 +1,7 @@
/*=============================================================================
Copyright (c) 2001-2006 Joel de Guzman
Distributed under the Boost Software License, Version 1.0. (See accompanying
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)
==============================================================================*/
#if !defined(BOOST_FUSION_SUPPORT_UNUSED_20070305_1038)
@ -13,7 +13,10 @@
# pragma warning(disable: 4522) // multiple assignment operators specified warning
#endif
namespace boost { namespace fusion {
#define BOOST_FUSION_UNUSED_HAS_IO
namespace boost { namespace fusion
{
struct unused_type
{
unused_type()
@ -53,6 +56,26 @@ namespace boost { namespace fusion {
};
unused_type const unused = unused_type();
namespace detail
{
struct unused_only
{
unused_only(unused_type const&) {}
};
}
template <typename Out>
inline Out& operator<<(Out& out, detail::unused_only const&)
{
return out;
}
template <typename In>
inline In& operator>>(In& in, unused_type&)
{
return in;
}
}}
#if defined(BOOST_MSVC)