summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-08-08 12:03:06 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-08-08 12:03:06 (GMT)
commited8ce3cf405204916f9832e26797cb15d1490fd1 (patch)
tree56484b096b4ea327d83999216897cc6b123b2777 /src
parent3cb963061343aa5b3b8a044cdfa62848723a02ee (diff)
downloadDoxygen-ed8ce3cf405204916f9832e26797cb15d1490fd1.zip
Doxygen-ed8ce3cf405204916f9832e26797cb15d1490fd1.tar.gz
Doxygen-ed8ce3cf405204916f9832e26797cb15d1490fd1.tar.bz2
Bug 732594 - Two entries for a single member in Doxygen XML
Diffstat (limited to 'src')
-rw-r--r--src/doxygen.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 7caac5e..13475a2 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -6155,7 +6155,8 @@ static void findMember(EntryNav *rootNav,
{
QCString memType = md->typeString();
memType.stripPrefix("static "); // see bug700696
- funcType=substitute(funcType,className+"::",""); // see bug700693
+ funcType=substitute(stripTemplateSpecifiersFromScope(funcType,TRUE),
+ className+"::",""); // see bug700693 & bug732594
Debug::print(Debug::FindMembers,0,
"5b. Comparing return types '%s'<->'%s' #args %d<->%d\n",
md->typeString(),funcType.data(),