diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-10-02 08:38:23 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-10-02 08:38:23 (GMT) |
| commit | 0d8c2bb9743f4ee862c740a6eedb228f28cd9725 (patch) | |
| tree | 851cee118e08a6b4e46505be5370355396d40c32 | |
| parent | c3d98a0794c8bd8246e06a21b41cd594bcdb3725 (diff) | |
| parent | 3bd20abcc5540dbe83ba4b3225d205b618053ad5 (diff) | |
| download | Doxygen-0d8c2bb9743f4ee862c740a6eedb228f28cd9725.zip Doxygen-0d8c2bb9743f4ee862c740a6eedb228f28cd9725.tar.gz Doxygen-0d8c2bb9743f4ee862c740a6eedb228f28cd9725.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/clangparser.h | 2 | ||||
| -rw-r--r-- | src/template.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/clangparser.h b/src/clangparser.h index 8ee1bdb..f948c33 100644 --- a/src/clangparser.h +++ b/src/clangparser.h @@ -30,7 +30,7 @@ class ClangTUParser void parse(); /** Switches to another file within the translation unit started with start(). - * @param[in] fileName The name of the file to switch to. + * @param[in] fd The file definition with the name of the file to switch to. */ void switchToFile(FileDef *fd); diff --git a/src/template.cpp b/src/template.cpp index 66347c4..58188fe 100644 --- a/src/template.cpp +++ b/src/template.cpp @@ -338,7 +338,7 @@ int TemplateList::release() uint TemplateList::count() const { - return p->elems.size(); + return static_cast<uint>(p->elems.size()); } void TemplateList::append(const TemplateVariant &v) |