mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#117918 codemaker: avoid including ourselves in .hpp files

Browse Source 
It's pointless, include guards will make sure it's a NOP, but it
confuses tools like IWYU.

Change-Id: Ic1f56ef267954cdf8bf3cb4f4a5e841d5e4bb82a
Reviewed-on: https://gerrit.libreoffice.org/55354
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Miklos Vajna
2018-06-05 22:14:44 +02:00
committed by Stephan Bergmann
parent ddbf228b2a
commit a96a260a5f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
codemaker/source/cppumaker/includes.cxx
View File

@@ -161,7 +161,10 @@ void Includes::dump(
if (m_hpp || pair.second == Dependencies::KIND_BASE if (m_hpp || pair.second == Dependencies::KIND_BASE
|| !isInterfaceType(u2b(pair.first))) || !isInterfaceType(u2b(pair.first)))
{ {
dumpInclude(out, u2b(pair.first), m_hpp); // If we know our name, then avoid including ourselves.
if (!companionHdl || *companionHdl != pair.first) {
dumpInclude(out, u2b(pair.first), m_hpp);
}
} else { } else {
bool ns = dumpNamespaceOpen(out, pair.first, false); bool ns = dumpNamespaceOpen(out, pair.first, false);
if (ns) { if (ns) {