summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-11-13 19:53:58 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-11-13 19:53:58 (GMT)
commit942b57dcbe7ac23a9d24a61eb60f84ca1f3b4f80 (patch)
tree7fe37a0f5108a0d51805335abb6a3af4ffdf011a /src
parent784313b82442747843145429d39e5d257256b7b0 (diff)
parentefb3eb758f443ba8aebda3665b725a4e0dd1196d (diff)
downloadDoxygen-942b57dcbe7ac23a9d24a61eb60f84ca1f3b4f80.zip
Doxygen-942b57dcbe7ac23a9d24a61eb60f84ca1f3b4f80.tar.gz
Doxygen-942b57dcbe7ac23a9d24a61eb60f84ca1f3b4f80.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
-rw-r--r--src/fortranscanner.l1
-rw-r--r--src/namespacedef.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index dfca1f8..6b581d2 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -774,6 +774,7 @@ private {
yyterminate();
}
yyextra->subrCurrent.pop_back();
+ yyextra->vtype = V_IGNORE;
yy_pop_state(yyscanner) ;
}
<BlockData>{
diff --git a/src/namespacedef.h b/src/namespacedef.h
index b81480e..730d68e 100644
--- a/src/namespacedef.h
+++ b/src/namespacedef.h
@@ -82,7 +82,7 @@ class NamespaceDef : public Definition
virtual QCString title() const = 0;
virtual QCString compoundTypeString() const = 0;
- // --- visited administation
+ // --- visited administration
virtual void setVisited(bool v) = 0;
virtual bool isVisited() const = 0;
};