summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2000-06-04 17:46:13 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2000-06-04 17:46:13 (GMT)
commitc6b7c8e7b6760ebfafa40a71eea48d1b46dec477 (patch)
tree85b63b795f663bb71c26c647948a085a3849177d /src/util.cpp
parent832e08dcc70203d84f75249583a95fa172492aa2 (diff)
downloadDoxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.zip
Doxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.tar.gz
Doxygen-c6b7c8e7b6760ebfafa40a71eea48d1b46dec477.tar.bz2
Release-1.1.4
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/util.cpp b/src/util.cpp
index bc5067f..c0246fa 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -463,6 +463,10 @@ QCString argListToString(ArgumentList *al)
{
result+= a->type;
}
+ if (!a->defval.isEmpty())
+ {
+ result+="="+a->defval;
+ }
a = al->next();
if (a) result+=",";
}
@@ -1062,6 +1066,7 @@ bool matchArguments(ArgumentList *srcAl,ArgumentList *dstAl,
stripIrrelevantConstVolatile(srcAType);
stripIrrelevantConstVolatile(dstAType);
+ if (srcA->array!=dstA->array) return FALSE;
if (srcAType!=dstAType) // check if the argument only differs on name
{
//printf("scope=`%s': `%s' <=> `%s'\n",className.data(),srcAType.data(),dstAType.data());
@@ -1256,8 +1261,6 @@ void mergeArguments(ArgumentList *srcAl,ArgumentList *dstAl)
{
//printf("mergeArguments `%s', `%s'\n",
// argListToString(srcAl).data(),argListToString(dstAl).data());
- //printArgList(srcAl);printf(" <=> ");
- //printArgList(dstAl);printf("\n");
if (srcAl==0 || dstAl==0 || srcAl->count()!=dstAl->count())
{
@@ -1795,6 +1798,15 @@ bool generateRef(OutputList &ol,const char *scName,
}
//printf("scope=`%s' name=`%s' arg=`%s' linkText=`%s'\n",
// scopeStr.data(),nameStr.data(),argsStr.data(),linkText.data());
+
+ // strip template specifier
+ // TODO: match against the correct partial template instantiation
+ int templPos=nameStr.find('<');
+ if (templPos!=-1 && nameStr.find("operator")==-1)
+ {
+ int endTemplPos=nameStr.findRev('>');
+ nameStr=nameStr.left(templPos)+nameStr.right(nameStr.length()-endTemplPos-1);
+ }
MemberDef *md = 0;
ClassDef *cd = 0;