summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-11-02 11:05:16 (GMT)
committerGitHub <noreply@github.com>2019-11-02 11:05:16 (GMT)
commit5d87377eec200dc0d0cc566e03e828f3edf31f83 (patch)
treee0e0a6e6fe2a873103f46996b9971a2b062492b0
parentcf81b382f696ba9be2dfe889b3f4c87fb265d91f (diff)
parent35461e5fe44be0537e60fd659fec9215181d4fd0 (diff)
downloadDoxygen-5d87377eec200dc0d0cc566e03e828f3edf31f83.zip
Doxygen-5d87377eec200dc0d0cc566e03e828f3edf31f83.tar.gz
Doxygen-5d87377eec200dc0d0cc566e03e828f3edf31f83.tar.bz2
Merge pull request #7364 from albert-github/feature/issue_7358
issue #7358: Ternary conditional and null-coalescing operator in constructor results in faulty warning
-rw-r--r--src/scanner.l2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 957c1e4..2259085 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -6858,7 +6858,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
}
<*>\? {
- if (insideCS)
+ if (insideCS && (YY_START != SkipRound))
{
if (current->type.isEmpty())
{