diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2011-06-06 19:49:53 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2011-06-06 19:49:53 (GMT) |
commit | de297f6d77f3861b649f3fcba443483d6be6afe9 (patch) | |
tree | b158d4e26359c261b119f485d1d4c69a6034663c /src/groupdef.cpp | |
parent | c604d141eb8b0708022a3e4b48b0b1871b692aa6 (diff) | |
download | Doxygen-de297f6d77f3861b649f3fcba443483d6be6afe9.zip Doxygen-de297f6d77f3861b649f3fcba443483d6be6afe9.tar.gz Doxygen-de297f6d77f3861b649f3fcba443483d6be6afe9.tar.bz2 |
Release-1.7.4-20110606
Diffstat (limited to 'src/groupdef.cpp')
-rw-r--r-- | src/groupdef.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/groupdef.cpp b/src/groupdef.cpp index f4d4eb9..0ac582b 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -235,15 +235,20 @@ bool GroupDef::insertMember(MemberDef *md,bool docOnly) (srcMd->getOuterScope()->definitionType()==Definition::TypeFile && md->getOuterScope()->definitionType()==Definition::TypeFile); - LockingPtr<ArgumentList> srcMdAl = srcMd->argumentList(); - LockingPtr<ArgumentList> mdAl = md->argumentList(); + LockingPtr<ArgumentList> srcMdAl = srcMd->argumentList(); + LockingPtr<ArgumentList> mdAl = md->argumentList(); + LockingPtr<ArgumentList> tSrcMdAl = srcMd->templateArguments(); + LockingPtr<ArgumentList> tMdAl = md->templateArguments(); - if (srcMd->isFunction() && md->isFunction() && + if (srcMd->isFunction() && md->isFunction() && // both are a function + (tSrcMdAl.pointer()==0 && tMdAl.pointer()==0 || + (tSrcMdAl.pointer()!=0 && tMdAl.pointer()!=0 && tSrcMdAl->count()==tMdAl->count()) + ) && // same number of template arguments matchArguments2(srcMd->getOuterScope(),srcMd->getFileDef(),srcMdAl.pointer(), md->getOuterScope(),md->getFileDef(),mdAl.pointer(), TRUE - ) && - sameScope + ) && // matching parameters + sameScope // both are found in the same scope ) { if (srcMd->getGroupAlias()==0) |