[prev in list] [next in list] [prev in thread] [next in thread]
List: boost-commit
Subject: [Boost-commit] svn:boost r63444 - trunk/boost/spirit/home/qi/detail
From: hartmut.kaiser () gmail ! com
Date: 2010-06-30 0:33:22
Message-ID: 20100630003322.53EF52F916F () wowbagger ! osl ! iu ! edu
[Download RAW message or body]
Author: hkaiser
Date: 2010-06-29 20:33:21 EDT (Tue, 29 Jun 2010)
New Revision: 63444
URL: http://svn.boost.org/trac/boost/changeset/63444
Log:
Spirit: fixing ambiguity in Qi auto_ API
Text files modified:
trunk/boost/spirit/home/qi/detail/parse_auto.hpp | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
Modified: trunk/boost/spirit/home/qi/detail/parse_auto.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/detail/parse_auto.hpp (original)
+++ trunk/boost/spirit/home/qi/detail/parse_auto.hpp 2010-06-29 20:33:21 EDT (Tue, 29 Jun 2010)
@@ -22,7 +22,11 @@
///////////////////////////////////////////////////////////////////////////
template <typename Expr>
struct parse_impl<Expr
- , typename enable_if<traits::meta_create_exists<qi::domain, Expr> >::type>
+ , typename enable_if<
+ mpl::and_<
+ traits::meta_create_exists<qi::domain, Expr>
+ , mpl::not_<traits::matches<qi::domain, Expr> > >
+ >::type>
{
template <typename Iterator>
static bool call(Iterator& first, Iterator last, Expr& expr)
@@ -76,7 +80,11 @@
///////////////////////////////////////////////////////////////////////////
template <typename Expr>
struct phrase_parse_impl<Expr
- , typename enable_if<traits::meta_create_exists<qi::domain, Expr> >::type>
+ , typename enable_if<
+ mpl::and_<
+ traits::meta_create_exists<qi::domain, Expr>
+ , mpl::not_<traits::matches<qi::domain, Expr> > >
+ >::type>
{
template <typename Iterator, typename Skipper>
static bool call(Iterator& first, Iterator last, Expr& expr
_______________________________________________
Boost-commit mailing list
Boost-commit@lists.boost.org
http://lists.boost.org/mailman/listinfo.cgi/boost-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic