diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-11-22 12:00:47 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-11-22 12:00:47 (GMT) |
| commit | 200b828ead9f6bb5b2f6f99919837d5828a250e4 (patch) | |
| tree | 124cf39b05148167a1b304fa84ca6cff81d5b515 | |
| parent | c6e41226574c94a869ad0757b53027562ef189e1 (diff) | |
| download | Doxygen-200b828ead9f6bb5b2f6f99919837d5828a250e4.zip Doxygen-200b828ead9f6bb5b2f6f99919837d5828a250e4.tar.gz Doxygen-200b828ead9f6bb5b2f6f99919837d5828a250e4.tar.bz2 | |
Bug 739863 - Regression: Base classes incorrect when using CRTP with default template parameter
| -rw-r--r-- | src/util.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/util.cpp b/src/util.cpp index acf0063..64e63c8 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -6027,10 +6027,11 @@ QCString substituteTemplateArgumentsInString( // for its template instance argument. bool found=FALSE; for (formAli.toFirst(); - (formArg=formAli.current()) && !found && (actArg=actAli.current()); + (formArg=formAli.current()) && !found; ++formAli,++actAli ) { + actArg = actAli.current(); if (formArg->type.left(6)=="class " && formArg->name.isEmpty()) { formArg->name = formArg->type.mid(6); @@ -6046,7 +6047,7 @@ QCString substituteTemplateArgumentsInString( //printf("n=%s formArg->type='%s' formArg->name='%s' formArg->defval='%s'\n", // n.data(),formArg->type.data(),formArg->name.data(),formArg->defval.data()); //printf(">> formArg->name='%s' actArg->type='%s' actArg->name='%s'\n", - // formArg->name.data(),actArg->type.data(),actArg->name.data() + // formArg->name.data(),actArg ? actArg->type.data() : "",actArg ? actArg->name.data() : "" // ); if (formArg->name==n && actArg && !actArg->type.isEmpty()) // base class is a template argument { |