summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2020-06-13 13:04:37 (GMT)
committerGitHub <noreply@github.com>2020-06-13 13:04:37 (GMT)
commit2aef0e0e4f91038b0b1d952efad0a3aba7d6a6cd (patch)
treeca7ef49c3c4cf43f8344219cde81d5ee9a235dbd
parentfce24d0725943a9b1a1ac069449fda1d0bdf9ab7 (diff)
downloadDoxygen-2aef0e0e4f91038b0b1d952efad0a3aba7d6a6cd.zip
Doxygen-2aef0e0e4f91038b0b1d952efad0a3aba7d6a6cd.tar.gz
Doxygen-2aef0e0e4f91038b0b1d952efad0a3aba7d6a6cd.tar.bz2
bug_121547 extern variable is being referenced in documentation incorrectly (#7792)
It is made clear that where the variable is declared "extern" that it is also shown at that place in the documentation
-rw-r--r--src/memberdef.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index d857fa6..1d7909b 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -2733,7 +2733,7 @@ void MemberDefImpl::getLabels(QStrList &sl,const Definition *container) const
isFriend() || isRelated() ||
(isInline() && inlineInfo) ||
isSignal() || isSlot() ||
- isStatic() ||
+ isStatic() || isExternal() ||
(getClassDef() && getClassDef()!=container && container->definitionType()==TypeClass) ||
(m_impl->memSpec & ~Entry::Inline)!=0
)
@@ -2745,7 +2745,7 @@ void MemberDefImpl::getLabels(QStrList &sl,const Definition *container) const
//ol.docify(" [");
SrcLangExt lang = getLanguage();
bool optVhdl = lang==SrcLangExt_VHDL;
- bool extractPrivate = Config_getBool(EXTRACT_PRIVATE);
+ static bool extractPrivate = Config_getBool(EXTRACT_PRIVATE);
if (optVhdl)
{
sl.append(theTranslator->trVhdlType(getMemberSpecifiers(),TRUE));
@@ -2756,7 +2756,8 @@ void MemberDefImpl::getLabels(QStrList &sl,const Definition *container) const
else if (isRelated()) sl.append("related");
else
{
- if (Config_getBool(INLINE_INFO) && isInline()) sl.append("inline");
+ if (isExternal()) sl.append("extern");
+ if (inlineInfo && isInline()) sl.append("inline");
if (isExplicit()) sl.append("explicit");
if (isMutable()) sl.append("mutable");
if (isStatic()) sl.append("static");