diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-02-12 20:43:31 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-13 09:04:19 +0100 |
| commit | 919f639c721256e852f20c0e84b3942860e69f32 (patch) | |
| tree | 7cec6a38e519ed50ccc9f728c55d537c51cf6997 /bin | |
| parent | 379d6e1dbe74a13dfe8d007e64cecdd1260c93ef (diff) | |
find-unneeded-includes: silence broken o3tl::optional -> std::optional proposal
This is just a workaround, see the upstream bugreport for the details.
Change-Id: I2334fb3ad86db7f43bd49c694eea3c240316bfa0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88566
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/find-unneeded-includes | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index 8ba5a7d354a6..a6ec228fce58 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -64,7 +64,10 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules): "functional": "bits/std_function.h", "cmath": "bits/std_abs.h", "ctime": "bits/types/clock_t.h", - "cstdint": "bits/stdint-uintn.h" + "cstdint": "bits/stdint-uintn.h", + # Keep using the o3tl wrapper for <optional>. + # Works around <https://github.com/include-what-you-use/include-what-you-use/issues/752>. + "o3tl/optional.hxx": "optional", } for k, v in bits.items(): if include == k and v in toAdd: |