diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-04-22 09:51:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 09:51:01 (GMT) |
| commit | b0b67978e4f099bb999fc5f099259e229b9ce5ad (patch) | |
| tree | 439ca1aef919ca186abc1a6ff5998a1e467f4226 /src/scanner.l | |
| parent | 89f808f75f7d39962a0b9dba4f479b5c6d6d9a24 (diff) | |
| parent | 243a3fce87107ac7c6afc7a9d5883ddc007a8534 (diff) | |
| download | Doxygen-b0b67978e4f099bb999fc5f099259e229b9ce5ad.zip Doxygen-b0b67978e4f099bb999fc5f099259e229b9ce5ad.tar.gz Doxygen-b0b67978e4f099bb999fc5f099259e229b9ce5ad.tar.bz2 | |
Merge branch 'master' into feature/bug_743539
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l index 3a6eac0..381ad6b 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -3635,7 +3635,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) current->fileName = yyFileName; current->startLine = yyLineNr; current->startColumn = yyColNr; - current->type = "@"; // enum marker + if (!(current_root->spec&Entry::Enum)) + { + current->type = "@"; // enum marker + } current->args = current->args.simplifyWhiteSpace(); current->name = current->name.stripWhiteSpace(); current->section = Entry::VARIABLE_SEC; |