summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-02-15 17:01:07 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-02-15 17:01:07 (GMT)
commit9b76c1a9bb7039962933aeef398bb7aa2f59c3a5 (patch)
treef4928d0fc57cb9d760776b4f0bb6112bde7ded49 /src
parentd96458ce99b92590a8fec0aba46c67b6816fa632 (diff)
downloadDoxygen-9b76c1a9bb7039962933aeef398bb7aa2f59c3a5.zip
Doxygen-9b76c1a9bb7039962933aeef398bb7aa2f59c3a5.tar.gz
Doxygen-9b76c1a9bb7039962933aeef398bb7aa2f59c3a5.tar.bz2
Bug 722457 - regression referencing namespaced type
Diffstat (limited to 'src')
-rw-r--r--src/doxygen.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index b195940..251f2b4 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -6163,12 +6163,14 @@ static void findMember(EntryNav *rootNav,
matching = FALSE;
}
}
+ bool rootIsUserDoc = (root->section&Entry::MEMBERDOC_SEC)!=0;
bool classIsTemplate = scopeIsTemplate(md->getClassDef());
bool mdIsTemplate = md->templateArguments()!=0;
bool classOrMdIsTemplate = mdIsTemplate || classIsTemplate;
bool rootIsTemplate = root->tArgLists!=0;
//printf("classIsTemplate=%d mdIsTemplate=%d rootIsTemplate=%d\n",classIsTemplate,mdIsTemplate,rootIsTemplate);
- if ((mdIsTemplate || rootIsTemplate) && // either md or root is a template
+ if (!rootIsUserDoc && // don't check out-of-line @fn references, see bug722457
+ (mdIsTemplate || rootIsTemplate) && // either md or root is a template
((classOrMdIsTemplate && !rootIsTemplate) || (!classOrMdIsTemplate && rootIsTemplate))
)
{