issue #8192: Excluded inline namespace broken after a5792da8

- Further fixes to make classes inside inline namespaces appear in the
  parent scope again.
- Also added a test case to check for regression

1 files changed, 8 insertions, 8 deletions

diff --git a/src/classlist.cpp b/src/classlist.cpp
index eae216a..d0f37ce 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -102,17 +102,15 @@ void ClassSDict::writeDeclaration(OutputList &ol,const ClassDef::CompoundType *f
     bool found=FALSE;
     for (sdi.toFirst();(cd=sdi.current());++sdi)
     {
-      ClassDefMutable *cdm = toClassDefMutable(cd);
       //printf("  ClassSDict::writeDeclaration for %s\n",cd->name().data());
-      if (cdm &&
-          !cd->isAnonymous() &&
+      if (!cd->isAnonymous() &&
           !cd->isExtension() &&
           (cd->protection()!=Private || extractPrivate) &&
           (filter==0 || *filter==cd->compoundType())
          )
       {
         //printf("writeDeclarationLink()\n");
-        cdm->writeDeclarationLink(ol,found,header,localNames);
+        cd->writeDeclarationLink(ol,found,header,localNames);
       }
     }
     if (found) ol.endMemberList();
@@ -139,9 +137,7 @@ void ClassSDict::writeDocumentation(OutputList &ol,const Definition * container)
       //  cd->name().data(),cd->getOuterScope(),cd->isLinkableInProject(),cd->isEmbeddedInOuterScope(),
       //  container,cd->partOfGroups() ? cd->partOfGroups()->count() : 0);
 
-      ClassDefMutable *cdm = toClassDefMutable(cd);
-      if (cdm &&
-          !cd->isAnonymous() &&
+      if (!cd->isAnonymous() &&
           cd->isLinkableInProject() &&
           cd->isEmbeddedInOuterScope() &&
           !cd->isAlias() &&
@@ -158,7 +154,11 @@ void ClassSDict::writeDocumentation(OutputList &ol,const Definition * container)
           ol.endGroupHeader();
           found=TRUE;
         }
-        cdm->writeInlineDocumentation(ol);
+        ClassDefMutable *cdm = toClassDefMutable(cd);
+        if (cdm)
+        {
+          cdm->writeInlineDocumentation(ol);
+        }
       }
     }
   }