summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-12-07 22:22:04 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-12-07 22:22:04 (GMT)
commit1028feb84f85a450a8050b94370e581450f4b87e (patch)
tree83aff87f7ba96a99d50ad5646b8d135d3ff5c02a
parent2da9dcc744acc01aaaf32ea486d59946e5fd9c37 (diff)
parent436efb218557f74deb45705c0c8153265d502022 (diff)
downloadDoxygen-1028feb84f85a450a8050b94370e581450f4b87e.zip
Doxygen-1028feb84f85a450a8050b94370e581450f4b87e.tar.gz
Doxygen-1028feb84f85a450a8050b94370e581450f4b87e.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
-rw-r--r--src/scanner.l9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 6160158..0807aaa 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1355,7 +1355,14 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
if (!insidePHP)
{
current->type += " abstract ";
- current->virt = Pure;
+ if (!insideJava)
+ {
+ current->virt = Pure;
+ }
+ else
+ {
+ current->spec|=Entry::Abstract;
+ }
}
else
{