summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-08-08 10:40:02 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-08-08 10:40:59 (GMT)
commitccd2c5b14568ab2ee369e901a260fcf35c69cdc9 (patch)
treea54d8a29dc08a48e31c6b00493cc3169ab6ebe83 /src
parentfd4ee7d2f86ac908aec909101ba7739630b7f42f (diff)
downloadDoxygen-ccd2c5b14568ab2ee369e901a260fcf35c69cdc9.zip
Doxygen-ccd2c5b14568ab2ee369e901a260fcf35c69cdc9.tar.gz
Doxygen-ccd2c5b14568ab2ee369e901a260fcf35c69cdc9.tar.bz2
Fixed a couple of compiler warnings on Linux
Diffstat (limited to 'src')
-rw-r--r--src/doxygen.cpp10
-rw-r--r--src/template.cpp2
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<Entry> &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<Entry> > 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<Entry> &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_index<m_list.p->elems.size())
+ if (m_index<m_list.p->elems.size())
{
v = m_list.p->elems[m_index];
return TRUE;