diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-28 17:24:25 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-12-01 13:58:49 +0100 |
| commit | 7b3190eda387bcd897095205732f6752dedf01ef (patch) | |
| tree | 73aee445ec22583a418b579898f2566e615c4e95 /xmlsecurity | |
| parent | 32b4936c9944111382d2491d99fc375b31d76723 (diff) | |
boost::optional: replace uses of get_value_or with value_or
...in preparation for wholesale replacement of boost::optional with
o3tl::optional, which will be an alias for either std::optional or
boost::optional, and std::optional only has value_or.
boost::optional::value_or was added with <https://github.com/boostorg/optional/
commit/3984c9f9a157ef116cea69bc8bb20f433320eb61> "Added function value_or()",
which according to git-describe first appeared in tag boost-1.56.0. We appear
to have no strict Boost baseline (the closest we get is with
> [AC_MSG_ERROR(boost/spirit/include/classic_core.hpp not found. install boost >= 1.36)]
in configure.ac), and at least CentOS 7 TDF machine tb76 only has
boost-devel-1.53.0-27.el7.x86_64. However, any environment using Xcode < 10
that needs to make o3tl::optional fall back to boost::optional should use
--without-system-boost, and external/boost is currently at 1.69.0, so should be
safe.
ATTENTION: In isolation, this commit will break in any environment that uses
Boost older than 1.56.0. It requires the following commit introducing
o3tl::optional. (But doing these changes in individual commits was deemed more
valuable than supporting a hypothetical future git-bisect against an old Boost.)
Change-Id: Ib31affa3eebf0d0029d8620dc6abb7a60f6c7629
Reviewed-on: https://gerrit.libreoffice.org/84127
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 4288e1ed426d..e268e6e25d63 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -250,7 +250,7 @@ OString getMozillaCurrentProfile( const css::uno::Reference< css::uno::XComponen try { OUString sUserSetCertPath = - officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString()); + officecfg::Office::Common::Security::Scripting::CertDir::get().value_or(OUString()); if (!sUserSetCertPath.isEmpty()) { |