Subject: [Boost-commit] svn:boost r67456 - trunk/boost/spirit/home/support
From: hartmut.kaiser_at_[hidden]
Date: 2010-12-26 10:31:03
Author: hkaiser
Date: 2010-12-26 10:31:01 EST (Sun, 26 Dec 2010)
New Revision: 67456
URL: http://svn.boost.org/trac/boost/changeset/67456
Log:
Spirit: clearly distinguish proto expressions from fusion sequences
Text files modified:
trunk/boost/spirit/home/support/attributes.hpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Modified: trunk/boost/spirit/home/support/attributes.hpp
==============================================================================
--- trunk/boost/spirit/home/support/attributes.hpp (original)
+++ trunk/boost/spirit/home/support/attributes.hpp 2010-12-26 10:31:01 EST (Sun, 26 Dec 2010)
@@ -679,13 +679,15 @@
// meta function to return whether the argument is a one element fusion
// sequence
///////////////////////////////////////////////////////////////////////////
- template <typename T, bool IsSeq = fusion::traits::is_sequence<T>::value>
+ template <typename T
+ , bool IsFusionSeq = fusion::traits::is_sequence<T>::value
+ , bool IsProtoExpr = proto::is_expr<T>::value>
struct one_element_sequence
: mpl::false_
{};
template <typename T>
- struct one_element_sequence<T, true>
+ struct one_element_sequence<T, true, false>
: mpl::bool_<mpl::size<T>::value == 1>
{};