diff options
| author | Andreas Regel <andreas.regel@newayselectronics.com> | 2018-05-28 11:12:22 (GMT) |
|---|---|---|
| committer | Andreas Regel <andreas.regel@newayselectronics.com> | 2018-05-28 11:12:22 (GMT) |
| commit | e7fe7109421e75b75c7f8d50dd0e1c165b880eea (patch) | |
| tree | 12a1a0410e689bacdcbce5541c6c1b2386379011 /src/classdef.cpp | |
| parent | 9f7406d151e4f5d021558e97f5d87a0d9cacecf9 (diff) | |
| parent | 63696c08425fc1662c5e76280e3cc74fb3769d80 (diff) | |
| download | Doxygen-e7fe7109421e75b75c7f8d50dd0e1c165b880eea.zip Doxygen-e7fe7109421e75b75c7f8d50dd0e1c165b880eea.tar.gz Doxygen-e7fe7109421e75b75c7f8d50dd0e1c165b880eea.tar.bz2 | |
Merge branch 'master' into vhdl-localization
# Conflicts:
# src/translator.h
Diffstat (limited to 'src/classdef.cpp')
| -rw-r--r-- | src/classdef.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index f121e27..f810154 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -2687,7 +2687,7 @@ bool ClassDef::hasNonReferenceSuperClass() return found; } -/*! called from MemberDef::writeDeclaration() to (recusively) write the +/*! called from MemberDef::writeDeclaration() to (recursively) write the * definition of an anonymous struct, union or class. */ void ClassDef::writeDeclaration(OutputList &ol,MemberDef *md,bool inGroup, @@ -2873,7 +2873,7 @@ static bool isStandardFunc(MemberDef *md) } /*! - * recusively merges the `all members' lists of a class base + * recursively merges the `all members' lists of a class base * with that of this class. Must only be called for classes without * subclasses! */ |