Commit f5aa5e7b authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 712819 - Some external namespaces appear in list despite having ALLEXTERNALS = NO

parent f20c2bab

src/doxygen.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -1836,6 +1836,10 @@ static void findUsingDirectives(EntryNav *rootNav) 
    //printf("Found using directive %s at line %d of %s\n",

    //printf("Found using directive %s at line %d of %s\n",

    //    root->name.data(),root->startLine,root->fileName.data());

    //    root->name.data(),root->startLine,root->fileName.data());

    QCString name=substitute(root->name,".","::");

    QCString name=substitute(root->name,".","::");

    if (name.right(2)=="::")

    {

      name=name.left(name.length()-2);

    }

    if (!name.isEmpty())

    if (!name.isEmpty())

    {

    {

      NamespaceDef *usingNd = 0;

      NamespaceDef *usingNd = 0;

src/util.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -218,6 +218,7 @@ QCString stripAnonymousNamespaceScope(const QCString &s) 
{

{

  int i,p=0,l;

  int i,p=0,l;

  QCString newScope;

  QCString newScope;

  int sl = s.length();

  while ((i=getScopeFragment(s,p,&l))!=-1)

  while ((i=getScopeFragment(s,p,&l))!=-1)

  {

  {

    //printf("Scope fragment %s\n",s.mid(i,l).data());

    //printf("Scope fragment %s\n",s.mid(i,l).data());
@@ -229,10 +230,10 @@ QCString stripAnonymousNamespaceScope(const QCString &s) 
        newScope+=s.mid(i,l);

        newScope+=s.mid(i,l);

      }

      }

    }

    }

    else

    else if (i<sl)

    {

    {

      if (!newScope.isEmpty()) newScope+="::";

      if (!newScope.isEmpty()) newScope+="::";

      newScope+=s.right(s.length()-i);

      newScope+=s.right(sl-i);

      goto done;

      goto done;

    }

    }

    p=i+l;

    p=i+l;