summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-07-28 20:14:48 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2002-07-28 20:14:48 (GMT)
commitadac91e9a353095c3bae4b580d27b7cfd8617493 (patch)
treeeb4c65d3676c6ecd00dc532bcb6420f9eb71aa32 /src/util.cpp
parentb860a5cc743f3297002876b58d4db5e504f4294d (diff)
downloadDoxygen-adac91e9a353095c3bae4b580d27b7cfd8617493.zip
Doxygen-adac91e9a353095c3bae4b580d27b7cfd8617493.tar.gz
Doxygen-adac91e9a353095c3bae4b580d27b7cfd8617493.tar.bz2
Release-1.2.17-20020728
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 4ca7d8e..7a48266 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -3148,7 +3148,7 @@ bool extractClassNameFromType(const QCString &type,int &pos,QCString &name,QCStr
/*! Substitutes any occurrence of a formal argument from argument list
* \a formalArgs in \a name by the corresponding actual argument in
* argument list \a actualArgs. The result after substitution
- * is returned as a string. The argument \a className is used to
+ * is returned as a string. The argument \a name is used to
* prevent recursive substitution.
*/
QCString substituteTemplateArgumentsInString(
@@ -3189,7 +3189,9 @@ QCString substituteTemplateArgumentsInString(
result += actArg->type;
found=TRUE;
}
- else if (formArg->name==n && actArg==0 && !formArg->defval.isEmpty())
+ else if (formArg->name==n && actArg==0 && !formArg->defval.isEmpty() &&
+ formArg->defval!=name /* to prevent recursion */
+ )
{
result += substituteTemplateArgumentsInString(formArg->defval,formalArgs,actualArgs);
found=TRUE;