Skip to content

D
doxverilog
Commit 9b76c1a9 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files
Options

Bug 722457 - regression referencing namespaced type

parent d96458ce
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
src/doxygen.cpp
View file @ 9b76c1a9
...@@ -6163,12 +6163,14 @@ static void findMember(EntryNav *rootNav, ...@@ -6163,12 +6163,14 @@ static void findMember(EntryNav *rootNav,
matching = FALSE; matching = FALSE;
} }
} }
bool rootIsUserDoc = (root->section&Entry::MEMBERDOC_SEC)!=0;
bool classIsTemplate = scopeIsTemplate(md->getClassDef()); bool classIsTemplate = scopeIsTemplate(md->getClassDef());
bool mdIsTemplate = md->templateArguments()!=0; bool mdIsTemplate = md->templateArguments()!=0;
bool classOrMdIsTemplate = mdIsTemplate || classIsTemplate; bool classOrMdIsTemplate = mdIsTemplate || classIsTemplate;
bool rootIsTemplate = root->tArgLists!=0; bool rootIsTemplate = root->tArgLists!=0;
//printf("classIsTemplate=%d mdIsTemplate=%d rootIsTemplate=%d\n",classIsTemplate,mdIsTemplate,rootIsTemplate); //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)) ((classOrMdIsTemplate && !rootIsTemplate) || (!classOrMdIsTemplate && rootIsTemplate))
) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment