summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-07-30 12:49:27 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-07-30 12:49:27 (GMT)
commit061955f3eedea881c906626bed4bc71da3e73355 (patch)
treeae0e37afe6706ee2dc326db2d4110a0954239d69
parent6c2946ad3265075b63a952b75716844af47bcfac (diff)
parente1e135b8a3a75986240e972686bcc5ad3e4f185c (diff)
downloadDoxygen-061955f3eedea881c906626bed4bc71da3e73355.zip
Doxygen-061955f3eedea881c906626bed4bc71da3e73355.tar.gz
Doxygen-061955f3eedea881c906626bed4bc71da3e73355.tar.bz2
Merge branch 'feature/regr_7105_2' of https://github.com/albert-github/doxygen into albert-github-feature/regr_7105_2
-rw-r--r--src/commentscan.l2
-rw-r--r--src/docgroup.cpp4
-rw-r--r--src/docgroup.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 5e9bfd7..a52821c 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -3195,7 +3195,7 @@ bool parseCommentBlock(/* in */ ParserInterface *parser,
if (current->section==Entry::MEMBERGRP_SEC &&
Doxygen::docGroup.isEmpty()) // @name section but no group started yet
{
- Doxygen::docGroup.open(current,yyFileName,yyLineNr);
+ Doxygen::docGroup.open(current,yyFileName,yyLineNr,true);
}
Debug::print(Debug::CommentScan,0,"-----------\nCommentScanner: %s:%d\noutput=[\n"
diff --git a/src/docgroup.cpp b/src/docgroup.cpp
index cfe19e8..2dcca70 100644
--- a/src/docgroup.cpp
+++ b/src/docgroup.cpp
@@ -90,9 +90,9 @@ int DocGroup::findExistingGroup(int &groupId,const MemberGroupInfo *info)
return groupId;
}
-void DocGroup::open(Entry *e,const char *,int)
+void DocGroup::open(Entry *e,const char *,int, bool implicit)
{
- m_openCount++;
+ if (!implicit) m_openCount++;
//printf("==> openGroup(name=%s,sec=%x) m_autoGroupStack=%d\n",
// e->name.data(),e->section,m_autoGroupStack.count());
if (e->section==Entry::GROUPDOC_SEC) // auto group
diff --git a/src/docgroup.h b/src/docgroup.h
index 38ee997..4ce9af9 100644
--- a/src/docgroup.h
+++ b/src/docgroup.h
@@ -32,7 +32,7 @@ class DocGroup
void leaveFile(const char *fileName,int line);
void enterCompound(const char *fileName,int line,const char *name);
void leaveCompound(const char *,int,const char * /*name*/);
- void open(Entry *e,const char *,int);
+ void open(Entry *e,const char *,int,bool implicit=false);
void close(Entry *e,const char *fileName,int line,bool foundInline);
void initGroupInfo(Entry *e);
bool isEmpty() const;