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

1028feb8 · Dimitri van Heesch · 2da9dcc7 · 436efb21 · 1028feb8
Commit 1028feb8 authored Dec 07, 2013 by Dimitri van Heesch
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

scanner.l src/scanner.l +8 -1

No files found.
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1355,12 +1355,19 @@ OPERATOR  "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
                                          if (!insidePHP) 
 					  {
 					    current->type += " abstract ";
+					    if (!insideJava)
+					    {
                                              current->virt = Pure;
 					    }
 					    else
 					    {
                                              current->spec|=Entry::Abstract;
 					    }
+					  }
+					  else
+					  {
+					    current->spec|=Entry::Abstract;
+					  }
 					  lineCount();
 					}
 <FindMembers>{B}*"inline"{BN}+		{ current->spec|=Entry::Inline;