From 9ad252b2e79576119c2d733a1a45fdd9e9f83140 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 21 Feb 2020 07:26:06 +0100 Subject: 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\"::' \ > -e 's/\/std::optional/g' \ > -e 's/\/std::make_optional/g' "$i" > done > for i in $(git grep -Flw o3tl::nullopt); do > sed -i -e 's/\/std::nullopt/g' "$i" > done (though that causes some of the resulting #include 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 --- ucb/source/ucp/ext/ucpext_content.hxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index ebe17b355f8d..ed0b6e93a5fd 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -25,7 +25,7 @@ #include -#include +#include namespace ucb { namespace ucp { namespace ext @@ -122,8 +122,8 @@ namespace ucb { namespace ucp { namespace ext private: ExtensionContentType m_eExtContentType; - ::o3tl::optional< bool > m_aIsFolder; - ::o3tl::optional< OUString > m_aContentType; + ::std::optional< bool > m_aIsFolder; + ::std::optional< OUString > m_aContentType; OUString m_sExtensionId; OUString m_sPathIntoExtension; }; -- cgit