diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-07-05 00:41:53 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-05 09:07:11 +0200 |
commit | 450482220a14a5e083f11bfa1c9561994dc91ec8 (patch) | |
tree | 3b463380d151d4d55628ccdbf1dca54baee7d555 | |
parent | pdfium: replace FPDFPath_GetMatrix() patch with backport (diff) | |
download | core-450482220a14a5e083f11bfa1c9561994dc91ec8.tar.gz core-450482220a14a5e083f11bfa1c9561994dc91ec8.zip |
find-unneeded-includes: stop proposing internal libstdc++ headers
They wouldn't really compile anyways and only cause unnecessary
blacklist entries.
Some '- memory' entries can already be removed from the blacklists.
Change-Id: Iab53d5a57121f61abe935e712dc23a55390235bf
Reviewed-on: https://gerrit.libreoffice.org/56979
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rwxr-xr-x | bin/find-unneeded-includes | 9 | ||||
-rw-r--r-- | chart2/IwyuFilter_chart2.yaml | 3 | ||||
-rw-r--r-- | sc/IwyuFilter_sc.yaml | 9 | ||||
-rw-r--r-- | sd/IwyuFilter_sd.yaml | 6 |
4 files changed, 10 insertions, 17 deletions
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index b4a2a89e0377..2e3d15f2230c 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -53,6 +53,15 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules): if include == k and v in toAdd: return True + # Avoid proposing to use libstdc++ internal headers. + bits = { + "exception": "bits/exception.h", + "memory": "bits/shared_ptr.h", + } + for k, v in bits.items(): + if include == k and v in toAdd: + return True + # Follow boost documentation. if include == "boost/optional.hpp" and "boost/optional/optional.hpp" in toAdd: return True diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index 92a202f08e4a..f95dad4807b7 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -38,9 +38,6 @@ blacklist: - com/sun/star/lang/XUnoTunnel.hpp - com/sun/star/qa/XDumper.hpp - com/sun/star/util/XModifyListener.hpp - chart2/source/inc/chartview/ExplicitValueProvider.hxx: - # base class has to be a complete type - - memory chart2/source/inc/AxisHelper.hxx: # base class has to be a complete type - com/sun/star/chart2/ScaleData.hpp diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml index 7941a28d7640..951f833a310a 100644 --- a/sc/IwyuFilter_sc.yaml +++ b/sc/IwyuFilter_sc.yaml @@ -38,9 +38,6 @@ blacklist: sc/inc/autoform.hxx: # contains macro definitions - scitems.hxx - sc/inc/calcconfig.hxx: - # needed for std::shared_ptr - - memory sc/inc/chartuno.hxx: # base class has to be a complete type - com/sun/star/container/XEnumerationAccess.hpp @@ -253,9 +250,6 @@ blacklist: sc/inc/scmatrix.hxx: # base class has to be a complete type - svl/sharedstringpool.hxx - sc/inc/simplerangelist.hxx: - # base class has to be a complete type - - memory sc/inc/spellcheckcontext.hxx: # base class has to be a complete type - editeng/misspellrange.hxx @@ -298,9 +292,6 @@ blacklist: - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/lang/XUnoTunnel.hpp - com/sun/star/text/XTextFieldsSupplier.hpp - sc/inc/token.hxx: - # needed for std::shared_ptr - - memory sc/inc/tokenuno.hxx: # base class has to be a complete type - com/sun/star/beans/XPropertySet.hpp diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index 9729c1b65af8..963b62da4088 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -70,7 +70,6 @@ blacklist: sd/inc/TransitionPreset.hxx: # base class has to be a complete type - com/sun/star/lang/XMultiServiceFactory.hpp - - memory sd/inc/undoanim.hxx: # base class has to be a complete type - com/sun/star/animations/XAnimationNode.hpp @@ -80,9 +79,6 @@ blacklist: sd/source/filter/eppt/eppt.hxx: # base class has to be a complete type - escherex.hxx - sd/source/filter/eppt/pptexanimations.hxx: - # base class has to be a complete type - - memory sd/source/ui/inc/AccessibleDocumentViewBase.hxx: # base class has to be a complete type - com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp @@ -124,4 +120,4 @@ blacklist: - sfx2/sfxbasecontroller.hxx sd/source/ui/inc/fupage.hxx: # base class has to be a complete type - - vcl/weld.hxx
\ No newline at end of file + - vcl/weld.hxx |