summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-01-11 14:31:15 (GMT)
committerGitHub <noreply@github.com>2020-01-11 14:31:15 (GMT)
commitf0cc9f6541b14ae52fb8ec4bf56e0ed3e454ff8a (patch)
treeedc9ed296735463bc49094f2dab140aca8f95181 /src
parenteace8c9e3ceb14fb80c6f548713624fd743f7276 (diff)
parent997e2b91f64e7f33898560bd935fddfc852f769e (diff)
downloadDoxygen-f0cc9f6541b14ae52fb8ec4bf56e0ed3e454ff8a.zip
Doxygen-f0cc9f6541b14ae52fb8ec4bf56e0ed3e454ff8a.tar.gz
Doxygen-f0cc9f6541b14ae52fb8ec4bf56e0ed3e454ff8a.tar.bz2
Merge pull request #7504 from albert-github/feature/bug_769411
Bug 769411 - Confuses functions with the same name, but different namespace
Diffstat (limited to 'src')
-rw-r--r--src/doxygen.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 5a5e95d..e32f8da 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -3724,7 +3724,7 @@ static void transferFunctionDocumentation()
MemberNameIterator mni2(*mn);
for (;(mdef=mni2.current());++mni2)
{
- if (mdec!=mdef && !mdec->isAlias() && !mdef->isAlias())
+ if (mdec!=mdef && mdec->getNamespaceDef()==mdef->getNamespaceDef() && !mdec->isAlias() && !mdef->isAlias())
{
combineDeclarationAndDefinition(mdec,mdef);
}