From ccd2c5b14568ab2ee369e901a260fcf35c69cdc9 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sat, 8 Aug 2020 12:40:02 +0200 Subject: Fixed a couple of compiler warnings on Linux --- src/doxygen.cpp | 10 +++++----- src/template.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 0075e32..0fb5c59 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9155,12 +9155,12 @@ static void parseFilesMultiThreading(const std::shared_ptr &root) { // lambda representing the work to executed by a thread auto processFile = [s,&filesToProcess,&processedFilesLock,&processedFiles]() { - bool ambig; + bool ambig_l; std::vector< std::shared_ptr > roots; - FileDef *fd = findFileDef(Doxygen::inputNameLinkedMap,s.c_str(),ambig); - auto clangParser = ClangParser::instance()->createTUParser(fd); + FileDef *fd_l = findFileDef(Doxygen::inputNameLinkedMap,s.c_str(),ambig_l); + auto clangParser = ClangParser::instance()->createTUParser(fd_l); auto parser = getParserForFile(s.c_str()); - auto fileRoot { parseFile(*parser.get(),fd,s.c_str(),clangParser.get(),true) }; + auto fileRoot { parseFile(*parser.get(),fd_l,s.c_str(),clangParser.get(),true) }; roots.push_back(fileRoot); // Now process any include files in the same translation unit @@ -9177,7 +9177,7 @@ static void parseFilesMultiThreading(const std::shared_ptr &root) } if (incFile!=s && needsToBeProcessed) { - FileDef *ifd=findFileDef(Doxygen::inputNameLinkedMap,incFile.c_str(),ambig); + FileDef *ifd=findFileDef(Doxygen::inputNameLinkedMap,incFile.c_str(),ambig_l); if (ifd && !ifd->isReference()) { //printf(" Processing %s in same translation unit as %s\n",incFile,s->c_str()); diff --git a/src/template.cpp b/src/template.cpp index 80962e8..66347c4 100644 --- a/src/template.cpp +++ b/src/template.cpp @@ -383,7 +383,7 @@ class TemplateListConstIterator : public TemplateListIntf::ConstIterator } virtual bool current(TemplateVariant &v) const { - if (m_index>=0 && m_indexelems.size()) + if (m_indexelems.size()) { v = m_list.p->elems[m_index]; return TRUE; -- cgit v0.12