From 7e403195e574be5174815a51cf5c42f06f76a87a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 30 Nov 2019 17:48:32 +0100 Subject: Introduce o3tl::optional as an alias for std::optional ...with a boost::optional fallback for Xcode < 10 (as std::optional is only available starting with Xcode 10 according to , and our baseline for iOS and macOS is still Xcode 9.3 according to README.md). And mechanically rewrite all code to use o3tl::optional instead of boost::optional. One immediate benefit is that disabling -Wmaybe-uninitialized for GCC as per fed7c3deb3f4ec81f78967c2d7f3c4554398cb9d "Slience bogus -Werror=maybe-uninitialized" should no longer be necessary (and whose check happened to no longer trigger for GCC 10 trunk, even though that compiler would still emit bogus -Wmaybe-uninitialized for uses of boost::optional under --enable-optimized, which made me ponder whether this switch from boost::optional to std::optional would be a useful thing to do; I keep that configure.ac check for now, though, and will only remove it in a follow up commit). Another longer-term benefit is that the code is now already in good shape for an eventual switch to std::optional (a switch we would have done anyway once we no longer need to support Xcode < 10). Only desktop/qa/desktop_lib/test_desktop_lib.cxx heavily uses boost::property_tree::ptree::get_child_optional returning boost::optional, so let it keep using boost::optional for now. After a number of preceding commits have paved the way for this change, this commit is completely mechanical, done with > git ls-files -z | grep -vz -e '^bin/find-unneeded-includes$' -e '^configure.ac$' -e '^desktop/qa/desktop_lib/test_desktop_lib.cxx$' -e '^dictionaries$' -e '^external/' -e '^helpcontent2$' -e '^include/IwyuFilter_include.yaml$' -e '^sc/IwyuFilter_sc.yaml$' -e '^solenv/gdb/boost/optional.py$' -e '^solenv/vs/LibreOffice.natvis$' -e '^translations$' -e '\.svg$' | xargs -0 sed -i -E -e 's|\|o3tl/optional.hxx|g' -e 's/\/o3tl\1::\2\3optional/g' -e 's/\/o3tl\1::\2nullopt/g' (before committing include/o3tl/optional.hxx, and relying on some GNU features). It excludes some files where mention of boost::optional et al should apparently not be changed (and the sub-repo directory stubs). It turned out that all uses of boost::none across the code base were in combination with boost::optional, so had all to be rewritten as o3tl::nullopt. Change-Id: Ibfd9f4b3d5a8aee6e6eed310b988c4e5ffd8b11b Reviewed-on: https://gerrit.libreoffice.org/84128 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- jvmfwk/source/elements.cxx | 26 +++++++++++++------------- jvmfwk/source/fwkbase.cxx | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'jvmfwk/source') diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx index bc4a4b7554b7..69688df85295 100644 --- a/jvmfwk/source/elements.cxx +++ b/jvmfwk/source/elements.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include // For backwards compatibility, the nFeatures and nRequirements flag words are @@ -236,9 +236,9 @@ void NodeJava::load() CXmlCharPtr sEnabled( xmlNodeListGetString( docUser, cur->children, 1)); if (xmlStrcmp(sEnabled, reinterpret_cast("true")) == 0) - m_enabled = boost::optional(true); + m_enabled = o3tl::optional(true); else if (xmlStrcmp(sEnabled, reinterpret_cast("false")) == 0) - m_enabled = boost::optional(false); + m_enabled = o3tl::optional(false); } } else if (xmlStrcmp(cur->name, reinterpret_cast("userClassPath")) == 0) @@ -251,7 +251,7 @@ void NodeJava::load() { CXmlCharPtr sUser(xmlNodeListGetString( docUser, cur->children, 1)); - m_userClassPath = boost::optional(OUString(sUser)); + m_userClassPath = o3tl::optional(OUString(sUser)); } } else if (xmlStrcmp(cur->name, reinterpret_cast("javaInfo")) == 0) @@ -264,7 +264,7 @@ void NodeJava::load() if (xmlStrcmp(sNil, reinterpret_cast("false")) == 0) { if (! m_javaInfo) - m_javaInfo = boost::optional(CNodeJavaInfo()); + m_javaInfo = o3tl::optional(CNodeJavaInfo()); m_javaInfo->loadFromNode(docUser, cur); } } @@ -277,7 +277,7 @@ void NodeJava::load() if (xmlStrcmp(sNil, reinterpret_cast("false")) == 0) { if ( ! m_vmParameters) - m_vmParameters = boost::optional >( + m_vmParameters = o3tl::optional >( std::vector ()); xmlNode * pOpt = cur->children; @@ -302,7 +302,7 @@ void NodeJava::load() if (xmlStrcmp(sNil, reinterpret_cast("false")) == 0) { if (! m_JRELocations) - m_JRELocations = boost::optional >( + m_JRELocations = o3tl::optional >( std::vector()); xmlNode * pLoc = cur->children; @@ -418,7 +418,7 @@ void NodeJava::write() const reinterpret_cast("nil"), reinterpret_cast("false")); - if (m_enabled == boost::optional(true)) + if (m_enabled == o3tl::optional(true)) xmlNodeSetContent(nodeEnabled,reinterpret_cast("true")); else xmlNodeSetContent(nodeEnabled,reinterpret_cast("false")); @@ -531,19 +531,19 @@ void NodeJava::write() const void NodeJava::setEnabled(bool bEnabled) { - m_enabled = boost::optional(bEnabled); + m_enabled = o3tl::optional(bEnabled); } void NodeJava::setUserClassPath(const OUString & sClassPath) { - m_userClassPath = boost::optional(sClassPath); + m_userClassPath = o3tl::optional(sClassPath); } void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect) { if (!m_javaInfo) - m_javaInfo = boost::optional(CNodeJavaInfo()); + m_javaInfo = o3tl::optional(CNodeJavaInfo()); m_javaInfo->bAutoSelect = bAutoSelect; m_javaInfo->bNil = false; @@ -571,13 +571,13 @@ void NodeJava::setJavaInfo(const JavaInfo * pInfo, bool bAutoSelect) void NodeJava::setVmParameters(std::vector const & arOptions) { - m_vmParameters = boost::optional >(arOptions); + m_vmParameters = o3tl::optional >(arOptions); } void NodeJava::addJRELocation(OUString const & sLocation) { if (!m_JRELocations) - m_JRELocations = boost::optional >( + m_JRELocations = o3tl::optional >( std::vector ()); //only add the path if not already present std::vector::const_iterator it = diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index ece4dd2bd717..df00365fd4c7 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -113,7 +113,7 @@ VendorSettings::VendorSettings(): } } -boost::optional VendorSettings::getVersionInformation(const OUString & sVendor) const +o3tl::optional VendorSettings::getVersionInformation(const OUString & sVendor) const { OSL_ASSERT(!sVendor.isEmpty()); OString osVendor = OUStringToOString(sVendor, RTL_TEXTENCODING_UTF8); -- cgit