From 12f8152891461fe57876ad9cb6e4fffee01ca9de Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Mon, 28 Jan 2013 17:41:42 +0000 Subject: [PATCH] Small bug fix in wrap - for return types, try to parse 'pair' before a simple type to prevent 'pair' spuriously being stored as the namespace of the return type, which causes return type validation to fail for pairs of simple types, i.e. 'pair' --- wrap/Module.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrap/Module.cpp b/wrap/Module.cpp index 536bf62d3..a847a8fb5 100644 --- a/wrap/Module.cpp +++ b/wrap/Module.cpp @@ -245,7 +245,7 @@ void Module::parseMarkup(const std::string& data) { Rule void_p = str_p("void")[assign_a(retVal.type1)][assign_a(retVal.category1, RETURN_VOID)]; - Rule returnType_p = void_p | returnType1_p | pair_p; + Rule returnType_p = void_p | pair_p | returnType1_p; Rule methodName_p = lexeme_d[lower_p >> *(alnum_p | '_')];