diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-07-30 11:55:36 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-07-30 11:55:36 (GMT) |
| commit | 412ded99c3d43c2bab0b868167a221b0facc10c9 (patch) | |
| tree | 78e1dac87594dcf448f18a88b6ff0a1d5d44c827 | |
| parent | 7c992e9030c05c44189b148db39acd29a4e7f6f0 (diff) | |
| parent | a2eb1df42d79104878d14dfc957a97e5ef5831eb (diff) | |
| download | Doxygen-412ded99c3d43c2bab0b868167a221b0facc10c9.zip Doxygen-412ded99c3d43c2bab0b868167a221b0facc10c9.tar.gz Doxygen-412ded99c3d43c2bab0b868167a221b0facc10c9.tar.bz2 | |
Merge branch 'feature/regr_7105' of https://github.com/albert-github/doxygen into albert-github-feature/regr_7105
| -rw-r--r-- | src/commentscan.l | 1 | ||||
| -rw-r--r-- | src/docgroup.cpp | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index b283a8b..5e9bfd7 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -3228,7 +3228,6 @@ bool parseCommentBlock(/* in */ ParserInterface *parser, return parseMore; } - static void handleGuard(const QCString &expr) { CondParser prs; diff --git a/src/docgroup.cpp b/src/docgroup.cpp index 2ed7473..cfe19e8 100644 --- a/src/docgroup.cpp +++ b/src/docgroup.cpp @@ -121,11 +121,14 @@ void DocGroup::open(Entry *e,const char *,int) void DocGroup::close(Entry *e,const char *fileName,int line,bool foundInline) { - m_openCount--; - if (m_openCount < 0) + if (m_openCount < 1) { warn(fileName,line,"unbalanced grouping commands"); } + else + { + m_openCount--; + } //printf("==> closeGroup(name=%s,sec=%x,file=%s,line=%d) m_autoGroupStack=%d\n", // e->name.data(),e->section,fileName,line,m_autoGroupStack.count()); if (m_memberGroupId!=DOX_NOGROUP) // end of member group |