summaryrefslogtreecommitdiff
path: root/source/d/doxygen/doxygen.9468ede.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/d/doxygen/doxygen.9468ede.diff')
-rw-r--r--source/d/doxygen/doxygen.9468ede.diff52
1 files changed, 52 insertions, 0 deletions
diff --git a/source/d/doxygen/doxygen.9468ede.diff b/source/d/doxygen/doxygen.9468ede.diff
new file mode 100644
index 00000000..b189a85a
--- /dev/null
+++ b/source/d/doxygen/doxygen.9468ede.diff
@@ -0,0 +1,52 @@
+From 9468ede259153cf79eb8d61635389744e9a2ee7d Mon Sep 17 00:00:00 2001
+From: Dimitri van Heesch <dimitri@stack.nl>
+Date: Sun, 29 Oct 2017 11:47:48 +0100
+Subject: [PATCH] Bug 789168 - Increasing access of inherited C++ members with
+ 'using...' is not recognized by Doxygen
+
+---
+ src/doxygen.cpp | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/doxygen.cpp b/src/doxygen.cpp
+index d3554cffd..ec97d4354 100644
+--- a/src/doxygen.cpp
++++ b/src/doxygen.cpp
+@@ -2112,9 +2112,8 @@ static void findUsingDeclImports(EntryNav *rootNav)
+ (rootNav->parent()->section()&Entry::COMPOUND_MASK) // in a class/struct member
+ )
+ {
+- //printf("Found using declaration %s at line %d of %s inside section %x\n",
+- // root->name.data(),root->startLine,root->fileName.data(),
+- // root->parent->section);
++ //printf("Found using declaration %s inside section %x\n",
++ // rootNav->name().data(), rootNav->parent()->section());
+ QCString fullName=removeRedundantWhiteSpace(rootNav->parent()->name());
+ fullName=stripAnonymousNamespaceScope(fullName);
+ fullName=stripTemplateSpecifiersFromScope(fullName);
+@@ -2130,7 +2129,7 @@ static void findUsingDeclImports(EntryNav *rootNav)
+ ClassDef *bcd = getResolvedClass(cd,0,scope); // todo: file in fileScope parameter
+ if (bcd)
+ {
+- //printf("found class %s\n",bcd->name().data());
++ //printf("found class %s memName=%s\n",bcd->name().data(),memName.data());
+ MemberNameInfoSDict *mndict=bcd->memberNameInfoSDict();
+ if (mndict)
+ {
+@@ -11181,7 +11180,6 @@ void parseInput()
+ g_s.end();
+
+ g_s.begin("Searching for members imported via using declarations...\n");
+- findUsingDeclImports(rootNav);
+ // this should be after buildTypedefList in order to properly import
+ // used typedefs
+ findUsingDeclarations(rootNav);
+@@ -11249,6 +11247,7 @@ void parseInput()
+ g_s.begin("Searching for member function documentation...\n");
+ findObjCMethodDefinitions(rootNav);
+ findMemberDocumentation(rootNav); // may introduce new members !
++ findUsingDeclImports(rootNav); // may introduce new members !
+
+ transferRelatedFunctionDocumentation();
+ transferFunctionDocumentation();
+