summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2020-01-11 14:04:39 (GMT)
committeralbert-github <albert.tests@gmail.com>2020-01-11 14:04:39 (GMT)
commit997e2b91f64e7f33898560bd935fddfc852f769e (patch)
treeedc9ed296735463bc49094f2dab140aca8f95181 /src/doxygen.cpp
parenteace8c9e3ceb14fb80c6f548713624fd743f7276 (diff)
downloadDoxygen-997e2b91f64e7f33898560bd935fddfc852f769e.zip
Doxygen-997e2b91f64e7f33898560bd935fddfc852f769e.tar.gz
Doxygen-997e2b91f64e7f33898560bd935fddfc852f769e.tar.bz2
Bug 769411 - Confuses functions with the same name, but different namespace
Check that the members are in the same namespace before combining documentation
Diffstat (limited to 'src/doxygen.cpp')
-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);
}