Skip to content

Commit

Permalink
Merge pull request boostorg#201 from mxc-commons/fix_alternative
Browse files Browse the repository at this point in the history
Fix for spirit_v2 qi/alternative test case
  • Loading branch information
djowel authored Aug 17, 2016
2 parents 0f7b47d + b2a0b2c commit 4c5b976
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions include/boost/spirit/home/qi/detail/alternative_function.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace boost { namespace spirit { namespace qi { namespace detail
template <typename Variant, typename Expected>
struct find_substitute
{
// Get the typr from the variant that can be a substitute for Expected.
// Get the type from the variant that can be a substitute for Expected.
// If none is found, just return Expected

typedef Variant variant_type;
Expand Down Expand Up @@ -138,8 +138,9 @@ namespace boost { namespace spirit { namespace qi { namespace detail
template <typename Component>
bool call(Component const& component, mpl::false_) const
{
// fix for alternative.cpp test case, FHE 2016-07-28
return call_optional_or_variant(
component, spirit::traits::not_is_variant<Attribute, qi::domain>());
component, mpl::not_<spirit::traits::not_is_optional<Attribute, qi::domain>>());
}

template <typename Component>
Expand Down

0 comments on commit 4c5b976

Please sign in to comment.