diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-04-28 12:38:14 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-04-28 12:38:14 (GMT) |
commit | 73b8e07966f16094f54a1c5e202dba635335e1b1 (patch) | |
tree | 5d6aca2bdddefdce0dc376f8ba2c6e3a02070b85 | |
parent | 4f903b6dd4e696ac13a3a6bf6141444ea0819c31 (diff) | |
parent | e148ac40cb0c5dee845f0a43c4c644dac1efc6a1 (diff) | |
download | Doxygen-73b8e07966f16094f54a1c5e202dba635335e1b1.zip Doxygen-73b8e07966f16094f54a1c5e202dba635335e1b1.tar.gz Doxygen-73b8e07966f16094f54a1c5e202dba635335e1b1.tar.bz2 |
Merge branch 'feature/bug_init_fd_line' of https://github.com/albert-github/doxygen into albert-github-feature/bug_init_fd_line
-rw-r--r-- | src/docparser.cpp | 2 | ||||
-rw-r--r-- | src/htmldocvisitor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index 61a1031..3d7ae33 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -1963,7 +1963,7 @@ void DocIncOperator::parse() if (g_includeFileName.isEmpty()) { warn_doc_error(g_fileName,doctokenizerYYlineno, - "No previous '\\include' or \\dontinclude' command for '\\%s' present", + "No previous '\\include' or '\\dontinclude' command for '\\%s' present", typeAsString()); } diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 212de0a..39ccb6a 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -790,7 +790,7 @@ void HtmlDocVisitor::visit(DocIncOperator *op) popEnabled(); if (!m_hide) { - FileDef *fd; + FileDef *fd = NULL; if (!op->includeFileName().isEmpty()) { QFileInfo cfi( op->includeFileName() ); |