summaryrefslogtreecommitdiff
path: root/codemaker
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2018-06-05 22:14:44 +0200
committerStephan Bergmann <sbergman@redhat.com>2018-06-06 08:41:29 +0200
commita96a260a5fd6303eeebb26aee4be24ddf88391d1 (patch)
tree40a7cf86bc5b3ead1cfd0379217276840e98696f /codemaker
parentddbf228b2af0c958105efa4022a28e015df3165b (diff)
tdf#117918 codemaker: avoid including ourselves in .hpp files
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>
Diffstat (limited to 'codemaker')
-rw-r--r--codemaker/source/cppumaker/includes.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx
index e33262ee7f6c..ddd541640671 100644
--- a/codemaker/source/cppumaker/includes.cxx
+++ b/codemaker/source/cppumaker/includes.cxx
@@ -161,7 +161,10 @@ void Includes::dump(
if (m_hpp || pair.second == Dependencies::KIND_BASE
|| !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 {
bool ns = dumpNamespaceOpen(out, pair.first, false);
if (ns) {