issue doxygen#11313 Template class specializations are ignored, which leads to invalid links

doxygen · doxygen · commit 4a8f03ac813f · 2025-01-06T14:40:13.000+01:00
diff --git a/src/classdef.cpp b/src/classdef.cpp
@@ -3045,7 +3045,7 @@ void ClassDefImpl::writeDocumentationForInnerClasses(OutputList &ol) const
   for (const auto &innerCd : m_innerClasses)
   {
     if (
-        innerCd->isLinkableInProject() && innerCd->templateMaster()==nullptr &&
+        innerCd->isLinkableInProject() && !innerCd->isImplicitTemplateInstance() &&
         protectionLevelVisible(innerCd->protection()) &&
         !innerCd->isEmbeddedInOuterScope()
        )
@@ -3536,7 +3536,7 @@ bool ClassDefImpl::isLinkableInProject() const
   bool extractLocal   = Config_getBool(EXTRACT_LOCAL_CLASSES);
   bool extractStatic  = Config_getBool(EXTRACT_STATIC);
   bool hideUndoc      = Config_getBool(HIDE_UNDOC_CLASSES);
-  if (m_templateMaster)
+  if (m_templateMaster && m_implicitTemplateInstance)
   {
     return m_templateMaster->isLinkableInProject();
   }
@@ -3565,7 +3565,7 @@ bool ClassDefImpl::isLinkableInProject() const
 
 bool ClassDefImpl::isLinkable() const
 {
-  if (m_templateMaster)
+  if (m_templateMaster && m_implicitTemplateInstance)
   {
     return m_templateMaster->isLinkable();
   }
@@ -3595,6 +3595,8 @@ bool ClassDefImpl::isVisibleInHierarchy() const
        (m_templateMaster && m_templateMaster->hasDocumentation()) ||
        isReference()
       ) &&
+      // if this is an implicit template instance then it most be part of the inheritance hierarchy
+      (!m_implicitTemplateInstance || !m_inherits.empty() || !m_inheritedBy.empty()) &&
       // is not part of an unnamed namespace or shown anyway
       (!m_isStatic || extractStatic);
 }
@@ -4211,8 +4213,8 @@ QCString ClassDefImpl::getOutputFileBase() const
       }
     }
   }
-  AUTO_TRACE("name='{}' m_templateMaster={}",name(),(void*)m_templateMaster);
-  if (m_templateMaster)
+  AUTO_TRACE("name='{}' m_templateMaster={} m_implicitTemplateInstance={}",name(),(void*)m_templateMaster,m_implicitTemplateInstance);
+  if (m_templateMaster && m_implicitTemplateInstance)
   {
     // point to the template of which this class is an instance
     return m_templateMaster->getOutputFileBase();
@@ -4227,7 +4229,7 @@ QCString ClassDefImpl::getInstanceOutputFileBase() const
 
 QCString ClassDefImpl::getSourceFileBase() const
 {
-  if (m_templateMaster)
+  if (m_templateMaster && m_implicitTemplateInstance)
   {
     return m_templateMaster->getSourceFileBase();
   }
@@ -4399,7 +4401,7 @@ void ClassDefImpl::addMembersToTemplateInstance(const ClassDef *cd,const Argumen
 
 QCString ClassDefImpl::getReference() const
 {
-  if (m_templateMaster)
+  if (m_templateMaster && m_implicitTemplateInstance)
   {
     return m_templateMaster->getReference();
   }
@@ -4411,7 +4413,7 @@ QCString ClassDefImpl::getReference() const
 
 bool ClassDefImpl::isReference() const
 {
-  if (m_templateMaster)
+  if (m_templateMaster && m_implicitTemplateInstance)
   {
     return m_templateMaster->isReference();
   }
@@ -5156,7 +5158,7 @@ QCString ClassDefImpl::anchor() const
   QCString anc;
   if (isEmbeddedInOuterScope() && !Doxygen::generatingXmlOutput)
   {
-    if (m_templateMaster)
+    if (m_templateMaster && m_implicitTemplateInstance)
     {
       // point to the template of which this class is an instance
       anc = m_templateMaster->getOutputFileBase();
diff --git a/src/defgen.cpp b/src/defgen.cpp
@@ -332,7 +332,7 @@ static void generateDEFForClass(const ClassDef *cd,TextStream &t)
 
   if (cd->isReference()) return; // skip external references.
   if (cd->name().find('@')!=-1) return; // skip anonymous compounds.
-  if (cd->templateMaster()!=nullptr) return; // skip generated template instances.
+  if (cd->isImplicitTemplateInstance()) return; // skip generated template instances.
 
   t << cd->compoundTypeString() << " = {\n";
   t << "  cp-id     = '" << cd->getOutputFileBase() << "';\n";
diff --git a/src/docbookgen.cpp b/src/docbookgen.cpp
@@ -652,7 +652,7 @@ DB_GEN_C2("IndexSection " << is)
         for (const auto &cd : *Doxygen::classLinkedMap)
         {
           if (cd->isLinkableInProject() &&
-              cd->templateMaster()==nullptr &&
+             !cd->isImplicitTemplateInstance() &&
              !cd->isEmbeddedInOuterScope() &&
              !cd->isAlias()
              )
diff --git a/src/dotnode.cpp b/src/dotnode.cpp
@@ -537,7 +537,7 @@ void DotNode::writeBox(TextStream &t,
     else // (!m_classDef->hasDocumentation() && !hasNonReachableChildren)
     {
       labCol = "grey75";
-      if (m_classDef->templateMaster() && m_classDef->templateMaster()->hasDocumentation())
+      if (m_classDef->templateMaster() && m_classDef->isImplicitTemplateInstance() && m_classDef->templateMaster()->hasDocumentation())
       {
         labCol = "gray40";
       }
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
@@ -8984,6 +8984,7 @@ static void countMembers()
 
 static void generateDocsForClassList(const std::vector<ClassDefMutable*> &classList)
 {
+  AUTO_TRACE();
   std::size_t numThreads = static_cast<std::size_t>(Config_getInt(NUM_PROC_THREADS));
   if (numThreads>1) // multi threaded processing
   {
@@ -9000,7 +9001,7 @@ static void generateDocsForClassList(const std::vector<ClassDefMutable*> &classL
     {
       //printf("cd=%s getOuterScope=%p global=%p\n",qPrint(cd->name()),cd->getOuterScope(),Doxygen::globalScope);
       if (cd->getOuterScope()==nullptr || // <-- should not happen, but can if we read an old tag file
-           cd->getOuterScope()==Doxygen::globalScope // only look at global classes
+          cd->getOuterScope()==Doxygen::globalScope // only look at global classes
          )
       {
         auto ctx = std::make_shared<DocContext>(cd,*g_outputList);
@@ -9011,7 +9012,7 @@ static void generateDocsForClassList(const std::vector<ClassDefMutable*> &classL
           // skip external references, anonymous compounds and
           // template instances
           if (!ctx->cd->isHidden() && !ctx->cd->isEmbeddedInOuterScope() &&
-              ctx->cd->isLinkableInProject() && ctx->cd->templateMaster()==nullptr)
+              ctx->cd->isLinkableInProject() && !ctx->cd->isImplicitTemplateInstance())
           {
             ctx->cd->writeDocumentation(ctx->ol);
             ctx->cd->writeMemberList(ctx->ol);
@@ -9042,7 +9043,7 @@ static void generateDocsForClassList(const std::vector<ClassDefMutable*> &classL
         // skip external references, anonymous compounds and
         // template instances
         if ( !cd->isHidden() && !cd->isEmbeddedInOuterScope() &&
-              cd->isLinkableInProject() && cd->templateMaster()==nullptr)
+              cd->isLinkableInProject() && !cd->isImplicitTemplateInstance())
         {
           msg("Generating docs for compound %s...\n",qPrint(cd->displayName()));
 
@@ -9062,7 +9063,13 @@ static void addClassAndNestedClasses(std::vector<ClassDefMutable*> &list,ClassDe
   for (const auto &innerCdi : cd->getClasses())
   {
     ClassDefMutable *innerCd = toClassDefMutable(innerCdi);
-    if (innerCd && innerCd->isLinkableInProject() && innerCd->templateMaster()==nullptr &&
+    if (innerCd)
+    {
+       AUTO_TRACE("innerCd={} isLinkable={} isImplicitTemplateInstance={} protectLevelVisible={} embeddedInOuterScope={}",
+           innerCd->name(),innerCd->isLinkableInProject(),innerCd->isImplicitTemplateInstance(),protectionLevelVisible(innerCd->protection()),
+           innerCd->isEmbeddedInOuterScope());
+    }
+    if (innerCd && innerCd->isLinkableInProject() && !innerCd->isImplicitTemplateInstance() &&
         protectionLevelVisible(innerCd->protection()) &&
         !innerCd->isEmbeddedInOuterScope()
        )
@@ -10017,7 +10024,7 @@ static void generateNamespaceClassDocs(const ClassLinkedRefMap &classList)
         auto processFile = [ctx]()
         {
           if ( ( ctx->cdm->isLinkableInProject() &&
-                ctx->cdm->templateMaster()==nullptr
+                !ctx->cdm->isImplicitTemplateInstance()
                ) // skip external references, anonymous compounds and
               // template instances and nested classes
               && !ctx->cdm->isHidden() && !ctx->cdm->isEmbeddedInOuterScope()
@@ -10048,7 +10055,7 @@ static void generateNamespaceClassDocs(const ClassLinkedRefMap &classList)
       if (cdm)
       {
         if ( ( cd->isLinkableInProject() &&
-              cd->templateMaster()==nullptr
+              !cd->isImplicitTemplateInstance()
              ) // skip external references, anonymous compounds and
             // template instances and nested classes
             && !cd->isHidden() && !cd->isEmbeddedInOuterScope()
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
@@ -1020,7 +1020,7 @@ void LatexGenerator::startIndexSection(IndexSection is)
         for (const auto &cd : *Doxygen::classLinkedMap)
         {
           if (cd->isLinkableInProject() &&
-              cd->templateMaster()==nullptr &&
+              !cd->isImplicitTemplateInstance() &&
               !cd->isEmbeddedInOuterScope() &&
               !cd->isAlias()
              )
@@ -1192,7 +1192,7 @@ void LatexGenerator::endIndexSection(IndexSection is)
         for (const auto &cd : *Doxygen::classLinkedMap)
         {
           if (cd->isLinkableInProject() &&
-              cd->templateMaster()==nullptr &&
+             !cd->isImplicitTemplateInstance() &&
              !cd->isEmbeddedInOuterScope() &&
              !cd->isAlias()
              )
diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp
@@ -1749,7 +1749,7 @@ void PerlModGenerator::generatePerlModForClass(const ClassDef *cd)
 
   if (cd->isReference())        return; // skip external references.
   if (cd->isAnonymous())        return; // skip anonymous compounds.
-  if (cd->templateMaster()!=nullptr)  return; // skip generated template instances.
+  if (cd->isImplicitTemplateInstance())  return; // skip generated template instances.
 
   m_output.openHash()
     .addFieldQuotedString("name", cd->name());
diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp
@@ -870,7 +870,7 @@ void RTFGenerator::startIndexSection(IndexSection is)
         for (const auto &cd : *Doxygen::classLinkedMap)
         {
           if (cd->isLinkableInProject() &&
-              cd->templateMaster()==nullptr &&
+             !cd->isImplicitTemplateInstance() &&
              !cd->isEmbeddedInOuterScope() &&
              !cd->isAlias()
              )
diff --git a/src/searchindex_js.cpp b/src/searchindex_js.cpp
@@ -196,7 +196,7 @@ static void addMemberToSearchIndex(const MemberDef *md)
   const GroupDef *gd=nullptr;
   if (isLinkable &&
       (
-       ((cd=md->getClassDef()) && cd->isLinkable() && cd->templateMaster()==nullptr) ||
+       ((cd=md->getClassDef()) && cd->isLinkable() && !cd->isImplicitTemplateInstance()) ||
        ((gd=md->getGroupDef()) && gd->isLinkable())
       )
      )
diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp
@@ -1936,7 +1936,7 @@ static void generateSqlite3ForClass(const ClassDef *cd)
   if (cd->isReference())        return; // skip external references.
   if (cd->isHidden())           return; // skip hidden classes.
   if (cd->isAnonymous())        return; // skip anonymous compounds.
-  if (cd->templateMaster()!=nullptr)  return; // skip generated template instances.
+  if (cd->isImplicitTemplateInstance())  return; // skip generated template instances.
 
   struct Refid refid = insertRefid(cd->getOutputFileBase());
 
diff --git a/src/symbolresolver.cpp b/src/symbolresolver.cpp
@@ -181,6 +181,7 @@ struct SymbolResolver::Private
                            bool  checkCV,                                       // in
                            bool insideCode,                                     // in
                            const QCString &explicitScopePart,                   // in
+                           const QCString &strippedTemplateParams,              // in
                            bool forceCallable,                                  // in
                            int &minDistance,                                    // inout
                            const Definition *&bestMatch,                        // out
@@ -419,7 +420,8 @@ const Definition *SymbolResolver::Private::getResolvedSymbolRec(
     replaceNamespaceAliases(explicitScopePart);
     name=name.mid(qualifierIndex+2);
   }
-  AUTO_TRACE_ADD("qualifierIndex={} name={} explicitScopePart={}",qualifierIndex,name,explicitScopePart);
+  AUTO_TRACE_ADD("qualifierIndex={} name={} explicitScopePart={} strippedTemplateParams={}",
+                 qualifierIndex,name,explicitScopePart,strippedTemplateParams);
 
   if (name.isEmpty())
   {
@@ -450,13 +452,14 @@ const Definition *SymbolResolver::Private::getResolvedSymbolRec(
   size_t scopeNameLen = scope!=Doxygen::globalScope ? scope->name().length()+1 : 0;
   size_t nameLen = name.length()+1;
   size_t explicitPartLen = explicitScopePart.length();
+  size_t strippedTemplateParamsLen = strippedTemplateParams.length();
   size_t fileScopeLen = hasUsingStatements ? 1+m_fileScope->absFilePath().length() : 0;
   size_t argsLen = args.length()+1;
 
   // below is a more efficient coding of
   // QCString key=scope->name()+"+"+name+"+"+explicitScopePart+args+typesOnly?'T':'F';
   std::string key;
-  key.reserve(scopeNameLen+nameLen+explicitPartLen+fileScopeLen+argsLen);
+  key.reserve(scopeNameLen+nameLen+explicitPartLen+strippedTemplateParamsLen+fileScopeLen+argsLen);
   if (scope!=Doxygen::globalScope)
   {
     key+=scope->name().str();
@@ -465,6 +468,7 @@ const Definition *SymbolResolver::Private::getResolvedSymbolRec(
   key+=name.str();
   key+='+';
   key+=explicitScopePart.str();
+  key+=strippedTemplateParams.str();
 
   // if a file scope is given and it contains using statements we should
   // also use the file part in the key (as a class name can be in
@@ -521,7 +525,7 @@ const Definition *SymbolResolver::Private::getResolvedSymbolRec(
     {
       if (isCodeSymbol(d->definitionType()))
       {
-         getResolvedSymbol(visitedKeys,scope,d,args,checkCV,insideCode,explicitScopePart,false,
+         getResolvedSymbol(visitedKeys,scope,d,args,checkCV,insideCode,explicitScopePart,strippedTemplateParams,false,
             minDistance,bestMatch,bestTypedef,bestTemplSpec,bestResolvedType);
       }
       if  (minDistance==0) break; // we can stop reaching if we already reached distance 0
@@ -535,7 +539,7 @@ const Definition *SymbolResolver::Private::getResolvedSymbolRec(
       {
         if (isCodeSymbol(d->definitionType()))
         {
-          getResolvedSymbol(visitedKeys,scope,d,QCString(),false,insideCode,explicitScopePart,true,
+          getResolvedSymbol(visitedKeys,scope,d,QCString(),false,insideCode,explicitScopePart,strippedTemplateParams,true,
             minDistance,bestMatch,bestTypedef,bestTemplSpec,bestResolvedType);
         }
         if  (minDistance==0) break; // we can stop reaching if we already reached distance 0
@@ -745,6 +749,7 @@ void SymbolResolver::Private::getResolvedSymbol(
                          bool  checkCV,                                       // in
                          bool  insideCode,                                    // in
                          const QCString &explicitScopePart,                   // in
+                         const QCString &strippedTemplateParams,              // in
                          bool forceCallable,                                  // in
                          int &minDistance,                                    // inout
                          const Definition *&bestMatch,                        // out
@@ -758,7 +763,11 @@ void SymbolResolver::Private::getResolvedSymbol(
   VisitedNamespaces visitedNamespaces;
   AccessStack accessStack;
   // test accessibility of definition within scope.
-  int distance = isAccessibleFromWithExpScope(visitedKeys,visitedNamespaces,accessStack,scope,d,explicitScopePart);
+  int distance = isAccessibleFromWithExpScope(visitedKeys,visitedNamespaces,accessStack,scope,d,explicitScopePart+strippedTemplateParams);
+  if (distance==-1 && !strippedTemplateParams.isEmpty())
+  {
+    distance = isAccessibleFromWithExpScope(visitedKeys,visitedNamespaces,accessStack,scope,d,explicitScopePart);
+  }
   AUTO_TRACE_ADD("distance={}",distance);
   if (distance!=-1) // definition is accessible
   {
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
@@ -1455,7 +1455,7 @@ static void generateXMLForClass(const ClassDef *cd,TextStream &ti)
   if (cd->isReference())        return; // skip external references.
   if (cd->isHidden())           return; // skip hidden classes.
   if (cd->isAnonymous())        return; // skip anonymous compounds.
-  if (cd->templateMaster()!=nullptr)  return; // skip generated template instances.
+  if (cd->isImplicitTemplateInstance())  return; // skip generated template instances.
   if (cd->isArtificial())       return; // skip artificially created classes
 
   msg("Generating XML output for class %s\n",qPrint(cd->name()));
diff --git a/testing/106/class_container_3_01_elem5_01_4.xml b/testing/106/class_container_3_01_elem5_01_4.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="" xml:lang="en-US">
+  <compounddef id="class_container_3_01_elem5_01_4" kind="class" language="C++" prot="public">
+    <compoundname>Container&lt; Elem5 &gt;</compoundname>
+    <innerclass refid="struct_container_3_01_elem5_01_4_1_1_nested" prot="public">Container&lt; Elem5 &gt;::Nested</innerclass>
+    <templateparamlist>
+    </templateparamlist>
+    <sectiondef kind="public-func">
+      <memberdef kind="function" id="class_container_3_01_elem5_01_4_1af27fc554d1ab2cff4b9bbbe01cee4b37" prot="public" static="no" const="no" explicit="no" inline="yes" virt="non-virtual">
+        <type>void</type>
+        <definition>void Container&lt; Elem5 &gt;::specialization</definition>
+        <argsstring>()</argsstring>
+        <name>specialization</name>
+        <qualifiedname>Container&lt; Elem5 &gt;::specialization</qualifiedname>
+        <briefdescription>
+        </briefdescription>
+        <detaileddescription>
+        </detaileddescription>
+        <inbodydescription>
+        </inbodydescription>
+        <location file="106_specialization.cpp" line="28" column="10" bodyfile="106_specialization.cpp" bodystart="28" bodyend="31"/>
+      </memberdef>
+    </sectiondef>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+    </detaileddescription>
+    <location file="106_specialization.cpp" line="25" column="1" bodyfile="106_specialization.cpp" bodystart="26" bodyend="33"/>
+    <listofallmembers>
+      <member refid="class_container_3_01_elem5_01_4_1af27fc554d1ab2cff4b9bbbe01cee4b37" prot="public" virt="non-virtual">
+        <scope>Container&lt; Elem5 &gt;</scope>
+        <name>specialization</name>
+      </member>
+    </listofallmembers>
+  </compounddef>
+</doxygen>
diff --git a/testing/106/index.xml b/testing/106/index.xml
diff --git a/testing/106/indexpage.xml b/testing/106/indexpage.xml
diff --git a/testing/106/struct_container_3_01_elem5_01_4_1_1_nested.xml b/testing/106/struct_container_3_01_elem5_01_4_1_1_nested.xml
diff --git a/testing/106_specialization.cpp b/testing/106_specialization.cpp
diff --git a/testing/runtests.py b/testing/runtests.py

Original file line number	Diff line number	Diff line change
`@@ -3045,7 +3045,7 @@ void ClassDefImpl::writeDocumentationForInnerClasses(OutputList &ol) const`
`3045`	`3045`	`for (const auto &innerCd : m_innerClasses)`
`3046`	`3046`	`{`
`3047`	`3047`	`if (`
`3048`		`- innerCd->isLinkableInProject() && innerCd->templateMaster()==nullptr &&`
	`3048`	`+ innerCd->isLinkableInProject() && !innerCd->isImplicitTemplateInstance() &&`
`3049`	`3049`	`protectionLevelVisible(innerCd->protection()) &&`
`3050`	`3050`	`!innerCd->isEmbeddedInOuterScope()`
`3051`	`3051`	`)`
`@@ -3536,7 +3536,7 @@ bool ClassDefImpl::isLinkableInProject() const`
`3536`	`3536`	`bool extractLocal = Config_getBool(EXTRACT_LOCAL_CLASSES);`
`3537`	`3537`	`bool extractStatic = Config_getBool(EXTRACT_STATIC);`
`3538`	`3538`	`bool hideUndoc = Config_getBool(HIDE_UNDOC_CLASSES);`
`3539`		`- if (m_templateMaster)`
	`3539`	`+ if (m_templateMaster && m_implicitTemplateInstance)`
`3540`	`3540`	`{`
`3541`	`3541`	`return m_templateMaster->isLinkableInProject();`
`3542`	`3542`	`}`
`@@ -3565,7 +3565,7 @@ bool ClassDefImpl::isLinkableInProject() const`
`3565`	`3565`
`3566`	`3566`	`bool ClassDefImpl::isLinkable() const`
`3567`	`3567`	`{`
`3568`		`- if (m_templateMaster)`
	`3568`	`+ if (m_templateMaster && m_implicitTemplateInstance)`
`3569`	`3569`	`{`
`3570`	`3570`	`return m_templateMaster->isLinkable();`
`3571`	`3571`	`}`
`@@ -3595,6 +3595,8 @@ bool ClassDefImpl::isVisibleInHierarchy() const`
`3595`	`3595`	`(m_templateMaster && m_templateMaster->hasDocumentation()) \|\|`
`3596`	`3596`	`isReference()`
`3597`	`3597`	`) &&`
	`3598`	`+ // if this is an implicit template instance then it most be part of the inheritance hierarchy`
	`3599`	`+ (!m_implicitTemplateInstance \|\| !m_inherits.empty() \|\| !m_inheritedBy.empty()) &&`
`3598`	`3600`	`// is not part of an unnamed namespace or shown anyway`
`3599`	`3601`	`(!m_isStatic \|\| extractStatic);`
`3600`	`3602`	`}`
`@@ -4211,8 +4213,8 @@ QCString ClassDefImpl::getOutputFileBase() const`
`4211`	`4213`	`}`
`4212`	`4214`	`}`
`4213`	`4215`	`}`
`4214`		`- AUTO_TRACE("name='{}' m_templateMaster={}",name(),(void*)m_templateMaster);`
`4215`		`- if (m_templateMaster)`
	`4216`	`+ AUTO_TRACE("name='{}' m_templateMaster={} m_implicitTemplateInstance={}",name(),(void*)m_templateMaster,m_implicitTemplateInstance);`
	`4217`	`+ if (m_templateMaster && m_implicitTemplateInstance)`
`4216`	`4218`	`{`
`4217`	`4219`	`// point to the template of which this class is an instance`
`4218`	`4220`	`return m_templateMaster->getOutputFileBase();`
`@@ -4227,7 +4229,7 @@ QCString ClassDefImpl::getInstanceOutputFileBase() const`
`4227`	`4229`
`4228`	`4230`	`QCString ClassDefImpl::getSourceFileBase() const`
`4229`	`4231`	`{`
`4230`		`- if (m_templateMaster)`
	`4232`	`+ if (m_templateMaster && m_implicitTemplateInstance)`
`4231`	`4233`	`{`
`4232`	`4234`	`return m_templateMaster->getSourceFileBase();`
`4233`	`4235`	`}`
`@@ -4399,7 +4401,7 @@ void ClassDefImpl::addMembersToTemplateInstance(const ClassDef *cd,const Argumen`
`4399`	`4401`
`4400`	`4402`	`QCString ClassDefImpl::getReference() const`
`4401`	`4403`	`{`
`4402`		`- if (m_templateMaster)`
	`4404`	`+ if (m_templateMaster && m_implicitTemplateInstance)`
`4403`	`4405`	`{`
`4404`	`4406`	`return m_templateMaster->getReference();`
`4405`	`4407`	`}`
`@@ -4411,7 +4413,7 @@ QCString ClassDefImpl::getReference() const`
`4411`	`4413`
`4412`	`4414`	`bool ClassDefImpl::isReference() const`
`4413`	`4415`	`{`
`4414`		`- if (m_templateMaster)`
	`4416`	`+ if (m_templateMaster && m_implicitTemplateInstance)`
`4415`	`4417`	`{`
`4416`	`4418`	`return m_templateMaster->isReference();`
`4417`	`4419`	`}`
`@@ -5156,7 +5158,7 @@ QCString ClassDefImpl::anchor() const`
`5156`	`5158`	`QCString anc;`
`5157`	`5159`	`if (isEmbeddedInOuterScope() && !Doxygen::generatingXmlOutput)`
`5158`	`5160`	`{`
`5159`		`- if (m_templateMaster)`
	`5161`	`+ if (m_templateMaster && m_implicitTemplateInstance)`
`5160`	`5162`	`{`
`5161`	`5163`	`// point to the template of which this class is an instance`
`5162`	`5164`	`anc = m_templateMaster->getOutputFileBase();`
Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ DB_GEN_C2("IndexSection " << is)`
`652`	`652`	`for (const auto &cd : *Doxygen::classLinkedMap)`
`653`	`653`	`{`
`654`	`654`	`if (cd->isLinkableInProject() &&`
`655`		`- cd->templateMaster()==nullptr &&`
	`655`	`+ !cd->isImplicitTemplateInstance() &&`
`656`	`656`	`!cd->isEmbeddedInOuterScope() &&`
`657`	`657`	`!cd->isAlias()`
`658`	`658`	`)`
Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ void DotNode::writeBox(TextStream &t,`
`537`	`537`	`else // (!m_classDef->hasDocumentation() && !hasNonReachableChildren)`
`538`	`538`	`{`
`539`	`539`	`labCol = "grey75";`
`540`		`- if (m_classDef->templateMaster() && m_classDef->templateMaster()->hasDocumentation())`
	`540`	`+ if (m_classDef->templateMaster() && m_classDef->isImplicitTemplateInstance() && m_classDef->templateMaster()->hasDocumentation())`
`541`	`541`	`{`
`542`	`542`	`labCol = "gray40";`
`543`	`543`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,7 @@ void LatexGenerator::startIndexSection(IndexSection is)`
`1020`	`1020`	`for (const auto &cd : *Doxygen::classLinkedMap)`
`1021`	`1021`	`{`
`1022`	`1022`	`if (cd->isLinkableInProject() &&`
`1023`		`- cd->templateMaster()==nullptr &&`
	`1023`	`+ !cd->isImplicitTemplateInstance() &&`
`1024`	`1024`	`!cd->isEmbeddedInOuterScope() &&`
`1025`	`1025`	`!cd->isAlias()`
`1026`	`1026`	`)`
`@@ -1192,7 +1192,7 @@ void LatexGenerator::endIndexSection(IndexSection is)`
`1192`	`1192`	`for (const auto &cd : *Doxygen::classLinkedMap)`
`1193`	`1193`	`{`
`1194`	`1194`	`if (cd->isLinkableInProject() &&`
`1195`		`- cd->templateMaster()==nullptr &&`
	`1195`	`+ !cd->isImplicitTemplateInstance() &&`
`1196`	`1196`	`!cd->isEmbeddedInOuterScope() &&`
`1197`	`1197`	`!cd->isAlias()`
`1198`	`1198`	`)`
Original file line number	Diff line number	Diff line change
`@@ -870,7 +870,7 @@ void RTFGenerator::startIndexSection(IndexSection is)`
`870`	`870`	`for (const auto &cd : *Doxygen::classLinkedMap)`
`871`	`871`	`{`
`872`	`872`	`if (cd->isLinkableInProject() &&`
`873`		`- cd->templateMaster()==nullptr &&`
	`873`	`+ !cd->isImplicitTemplateInstance() &&`
`874`	`874`	`!cd->isEmbeddedInOuterScope() &&`
`875`	`875`	`!cd->isAlias()`
`876`	`876`	`)`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ static void addMemberToSearchIndex(const MemberDef *md)`
`196`	`196`	`const GroupDef *gd=nullptr;`
`197`	`197`	`if (isLinkable &&`
`198`	`198`	`(`
`199`		`- ((cd=md->getClassDef()) && cd->isLinkable() && cd->templateMaster()==nullptr) \|\|`
	`199`	`+ ((cd=md->getClassDef()) && cd->isLinkable() && !cd->isImplicitTemplateInstance()) \|\|`
`200`	`200`	`((gd=md->getGroupDef()) && gd->isLinkable())`
`201`	`201`	`)`
`202`	`202`	`)`