summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-05-20 10:30:05 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-05-20 10:30:05 (GMT)
commitaddd6773786a13382ed5f52bc5d197e01bb2b6a3 (patch)
treede91f3d5af87a7a6c5a6e5bc9f9fef9927b286dd
parentbab453f822f81dbeeba2331c6d0ae4cbe3f4d2ec (diff)
downloadDoxygen-addd6773786a13382ed5f52bc5d197e01bb2b6a3.zip
Doxygen-addd6773786a13382ed5f52bc5d197e01bb2b6a3.tar.gz
Doxygen-addd6773786a13382ed5f52bc5d197e01bb2b6a3.tar.bz2
Bug 700696 - Template static member functions duplicated as non-static public
-rw-r--r--src/doxygen.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index e1fe597..4c5a8d0 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -6105,11 +6105,13 @@ static void findMember(EntryNav *rootNav,
// for template member we also need to check the return type
if (md->templateArguments()!=0 && root->tArgLists!=0)
{
+ QCString memType = md->typeString();
+ memType.stripPrefix("static "); // see bug700696
//printf("Comparing return types '%s'<->'%s' args %d<->%d\n",
// md->typeString(),funcType.data(),
// md->templateArguments()->count(),root->tArgLists->last()->count());
if (md->templateArguments()->count()!=root->tArgLists->last()->count() ||
- qstrcmp(md->typeString(),funcType))
+ qstrcmp(memType,funcType))
{
//printf(" ---> no matching\n");
matching = FALSE;