Bug 709870 - Broken links on members HTML page when using BUILTIN_STL_SUPPORT

src/classdef.cpp

@@ -2255,7 +2255,8 @@ void ClassDef::writeMemberList(OutputList &ol)
           ol.writeString("</td>");
           memberWritten=TRUE;
         }
-        else if (!Config_getBool("HIDE_UNDOC_MEMBERS") && 
+        else if (!cd->isArtificial() &&
+                 !Config_getBool("HIDE_UNDOC_MEMBERS") && 
                   (protectionLevelVisible(md->protection()) || md->isFriend()) 
                 ) // no documentation, 
                   // generate link to the class instead.
@@ -4143,6 +4144,8 @@ int ClassDef::countInheritedDecMembers(MemberListType lt,
       {
         ClassDef *icd=ibcd->classDef;
         int lt1,lt2;
+        if (icd->isLinkable())
+        {
           convertProtectionLevel(lt,ibcd->prot,&lt1,&lt2);
           //printf("%s: convert %d->(%d,%d) prot=%d\n",
           //    icd->name().data(),lt,lt1,lt2,ibcd->prot);
@@ -4157,6 +4160,7 @@ int ClassDef::countInheritedDecMembers(MemberListType lt,
         }
       }
     }
+  }
   return inhCount;
 }
 
@@ -4279,6 +4283,8 @@ void ClassDef::writeInheritedMemberDeclarations(OutputList &ol,
       for (it.toFirst();(ibcd=it.current());++it)
       {
         ClassDef *icd=ibcd->classDef;
+        if (icd->isLinkable())
+        {
           int lt1,lt3;
           convertProtectionLevel(lt,ibcd->prot,&lt1,&lt3);
           if (lt2==-1 && lt3!=-1)
@@ -4292,7 +4298,7 @@ void ClassDef::writeInheritedMemberDeclarations(OutputList &ol,
             if (lt1!=-1)
             {
               icd->writeMemberDeclarations(ol,(MemberListType)lt1,
-                title,QCString(),FALSE,inheritedFrom,lt2,FALSE /*invert*/,TRUE,visitedClasses);
+                  title,QCString(),FALSE,inheritedFrom,lt2,FALSE,TRUE,visitedClasses);
             }
           }
           else
@@ -4302,6 +4308,7 @@ void ClassDef::writeInheritedMemberDeclarations(OutputList &ol,
         }
       }
     }
+  }
   ol.popGeneratorState();
 }