diff options
| author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2002-07-15 20:10:02 (GMT) |
|---|---|---|
| committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2002-07-15 20:10:02 (GMT) |
| commit | b860a5cc743f3297002876b58d4db5e504f4294d (patch) | |
| tree | b9a5247ad8e1b7ecda53346aa9e29e3e10167e5b /src/classdef.cpp | |
| parent | bcbf69496a8e7e703ecf4fb6e5de264f86ebea84 (diff) | |
| download | Doxygen-b860a5cc743f3297002876b58d4db5e504f4294d.zip Doxygen-b860a5cc743f3297002876b58d4db5e504f4294d.tar.gz Doxygen-b860a5cc743f3297002876b58d4db5e504f4294d.tar.bz2 | |
Release-1.2.17
Diffstat (limited to 'src/classdef.cpp')
| -rw-r--r-- | src/classdef.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/classdef.cpp b/src/classdef.cpp index 0f7672b..0185d47 100644 --- a/src/classdef.cpp +++ b/src/classdef.cpp @@ -580,9 +580,10 @@ static void writeInheritanceSpecifier(OutputList &ol,BaseClassDef *bcd) } } -void ClassDef::setIncludeFile(FileDef *fd,const char *includeName,bool local) +void ClassDef::setIncludeFile(FileDef *fd, + const char *includeName,bool local, bool force) { - //printf("ClassDef::setInclude(%p,%s,%d)\n",fd,includeName,local); + //printf("ClassDef::setIncludeFile(%p,%s,%d,%d)\n",fd,includeName,local,force); if (!m_incInfo) m_incInfo=new IncludeInfo; if ((includeName && m_incInfo->includeName.isEmpty()) || (fd!=0 && m_incInfo->fileDef==0) @@ -593,6 +594,7 @@ void ClassDef::setIncludeFile(FileDef *fd,const char *includeName,bool local) m_incInfo->includeName = includeName; m_incInfo->local = local; } + if (force && includeName) m_incInfo->includeName = includeName; } // TODO: fix this: a nested template class can have multiple outer templates |