diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-02-21 07:26:06 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-02-21 14:50:28 +0100 |
| commit | 9ad252b2e79576119c2d733a1a45fdd9e9f83140 (patch) | |
| tree | 87fee16145d457b6799a05c389d85270476f7f35 /bin/find-unneeded-includes | |
| parent | loplugin:sequenceloop improve rvalue detection (diff) | |
| download | core-9ad252b2e79576119c2d733a1a45fdd9e9f83140.tar.gz core-9ad252b2e79576119c2d733a1a45fdd9e9f83140.zip | |
Drop o3tl::optional wrapper
...now that macOS builds are guaranteed to have std::optional since
358146bbbd1b9775c12770fb5e497b6ec5adfc51 "Bump macOS build baseline to
Xcode 11.3 and macOS 10.14.4".
The change is done mostly mechanically with
> for i in $(git grep -Fl optional); do
> sed -i -e 's:<o3tl/optional\.hxx>\|\"o3tl/optional\.hxx\":<optional>:' \
> -e 's/\<o3tl::optional\>/std::optional/g' \
> -e 's/\<o3tl::make_optional\>/std::make_optional/g' "$i"
> done
> for i in $(git grep -Flw o3tl::nullopt); do
> sed -i -e 's/\<o3tl::nullopt\>/std::nullopt/g' "$i"
> done
(though that causes some of the resulting
#include <optional>
to appear at different places relative to other includes than if they had been
added manually), plus a few manual modifications:
* adapt bin/find-unneeded-includes
* adapt desktop/IwyuFilter_desktop.yaml
* remove include/o3tl/optional.hxx
* quote resulting "<"/">" as "<"/">" in officecfg/registry/cppheader.xsl
* and then solenv/clang-format/reformat-formatted-files
Change-Id: I68833d9f7945e57aa2bc703349cbc5a56b342273
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89165
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bin/find-unneeded-includes')
| -rwxr-xr-x | bin/find-unneeded-includes | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index a6ec228fce58..fcbabad87465 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -65,9 +65,6 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules): "cmath": "bits/std_abs.h", "ctime": "bits/types/clock_t.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: |