[Libreoffice-commits] core.git: bin/find-unneeded-includes

[Miklos Vajna (via logerrit)]

 bin/find-unneeded-includes |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 919f639c721256e852f20c0e84b3942860e69f32
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Feb 12 20:43:31 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Feb 13 09:04:19 2020 +0100

    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 at collabora.com>

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: