diff options
Diffstat (limited to 'src/doxygen.cpp')
| -rw-r--r-- | src/doxygen.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 16dc0a6..73c4b02 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -7348,7 +7348,7 @@ static void computeMemberRelations() if (md!=bmd) { const ClassDef *mcd = md->getClassDef(); - if (mcd && mcd->baseClasses()) + if (mcd && !mcd->baseClasses().empty()) { const ClassDef *bmcd = bmd->getClassDef(); //printf("Check relation between '%s'::'%s' (%p) and '%s'::'%s' (%p)\n", @@ -7469,8 +7469,8 @@ static void buildCompleteMemberLists() for (cli.toFirst();(cd=cli.current());++cli) { if (// !cd->isReference() && // not an external class - cd->subClasses()==0 && // is a root of the hierarchy - cd->baseClasses()) // and has at least one base class + cd->subClasses().empty() && // is a root of the hierarchy + !cd->baseClasses().empty()) // and has at least one base class { //printf("*** merging members for %s\n",cd->name().data()); cd->mergeMembers(); @@ -7647,15 +7647,15 @@ static void generateFileSources() results.emplace_back(threadPool.queue(processFile)); } } + // first wait until all files are processed for (auto &f : results) { - std::shared_ptr<SourceContext> ctx = f.get(); + auto ctx = f.get(); if (ctx->generateSourceFile) { ctx->fd->writeSourceFooter(ctx->ol); } } - #else // single threaded version for (const auto &fn : *Doxygen::inputNameLinkedMap) { |