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 /unoxml | |
| parent | 3aca35f1505fa552eaa316a2d47a60ef52646525 (diff) | |
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 'unoxml')
| -rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index aca43c107e77..dc665a9d5172 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -28,7 +28,7 @@ #include <algorithm> #include <atomic> -#include <o3tl/optional.hxx> +#include <optional> #include <libxslt/security.h> @@ -199,9 +199,9 @@ public: { OString const value; OString const language; - ::o3tl::optional<OString> const type; + ::std::optional<OString> const type; Literal(OString const& i_rValue, OString const& i_rLanguage, - ::o3tl::optional<OString> const& i_rType) + ::std::optional<OString> const& i_rType) : value(i_rValue) , language(i_rLanguage) , type(i_rType) @@ -2215,7 +2215,7 @@ librdf_TypeConverter::extractNode_NoLock( OUStringToOString(xLiteral->getLanguage(), RTL_TEXTENCODING_UTF8) ); const uno::Reference< rdf::XURI > xType(xLiteral->getDatatype()); - o3tl::optional<OString> type; + std::optional<OString> type; if (xType.is()) { type = |