Merge branch 'master' of github.com:doxygen/doxygen

Dimitri van Heesch · Dimitri van Heesch · commit 50720068afa7 · 2016-02-02T21:16:28.000+01:00
diff --git a/src/scanner.l b/src/scanner.l
@@ -4234,7 +4234,7 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
 <FuncFuncType>.				{
   					  current->type += *yytext;
   					}
-<FindMembers>"("/{BN}*{ID}{BN}*"*"{BN}*{ID}*")(" { // for catching typedef void (__stdcall *f)() like definitions
+<FindMembers>"("/{BN}*{ID}{BN}*"*"{BN}*{ID}*")"{BN}*"(" { // for catching typedef void (__stdcall *f)() like definitions
                                           if (current->type.left(7)=="typedef" && current->bodyLine==-1) 
 					    // the bodyLine check is to prevent this guard to be true more than once
 					  {

Original file line number	Diff line number	Diff line change
`@@ -4234,7 +4234,7 @@ OPERATOR "operator"{B}*({ARITHOP}\|{ASSIGNOP}\|{LOGICOP}\|{BITOP})`
`4234`	`4234`	`<FuncFuncType>. {`
`4235`	`4235`	`current->type += *yytext;`
`4236`	`4236`	`}`
`4237`		`-<FindMembers>"("/{BN}{ID}{BN}""{BN}{ID}")(" { // for catching typedef void (__stdcall f)() like definitions`
	`4237`	`+<FindMembers>"("/{BN}{ID}{BN}""{BN}{ID}")"{BN}"(" { // for catching typedef void (__stdcall *f)() like definitions`
`4238`	`4238`	`if (current->type.left(7)=="typedef" && current->bodyLine==-1)`
`4239`	`4239`	`// the bodyLine check is to prevent this guard to be true more than once`
`4240`	`4240`	`{`