summaryrefslogtreecommitdiffstats
path: root/src/util.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-12-19 14:19:01 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-12-19 14:19:01 (GMT)
commitf9c9edba086f544b813ff036ea9209744da18c44 (patch)
tree77cb5a20c3ab2c4fcbbd8920d6a9dce28a99b1d8 /src/util.cpp
parentfa239ea9a3bba27e4fff84629883ee400f674c1e (diff)
downloadDoxygen-f9c9edba086f544b813ff036ea9209744da18c44.zip
Doxygen-f9c9edba086f544b813ff036ea9209744da18c44.tar.gz
Doxygen-f9c9edba086f544b813ff036ea9209744da18c44.tar.bz2
Bug 704090 - Allow Class{T}.Method in cref to refer to a generic class in XML comments
Diffstat (limited to 'src/util.cpp')
-rw-r--r--src/util.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/util.cpp b/src/util.cpp
index 39d0ba2..000de53 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -4716,6 +4716,7 @@ bool resolveLink(/* in */ const char *scName,
*resContext=0;
QCString linkRef=lr;
+ QCString linkRefWithoutTemplates = stripTemplateSpecifiersFromScope(linkRef,FALSE);
//printf("ResolveLink linkRef=%s inSee=%d\n",lr,inSeeBlock);
FileDef *fd;
GroupDef *gd;
@@ -4772,6 +4773,12 @@ bool resolveLink(/* in */ const char *scName,
resAnchor=cd->anchor();
return TRUE;
}
+ else if ((cd=getClass(linkRefWithoutTemplates))) // C#/Java generic class link
+ {
+ *resContext=cd;
+ resAnchor=cd->anchor();
+ return TRUE;
+ }
else if ((cd=getClass(linkRef+"-p"))) // Obj-C protocol link
{
*resContext=cd;