diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 16:50:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-11-30 17:44:34 +0100 |
| commit | 47dd2c63f649828a833543e21d4eca5866ec9ebe (patch) | |
| tree | 0b9a64485028cb9c7c0ffc52cad79033b2cb6209 /include | |
| parent | 6ddefb080b12f54f84a8de44347a9b1816972ad3 (diff) | |
Rewrite uses of boost::optional
...to only use functions that are also available for std::optional (in
preparation for changing from boost::optional to std::optional):
* uses of get are replaced with operator * or operator ->
* uses of is_initialized are replaced with operator bool
* uses of reset with an argument are replace with operator =
(All of the replacements are also available for boost::optional "since forever",
so this change should not break builds against old --with-system-boost. An
alternative replacement for is_initialized would have been has_value, but that
is only available since Boost 1.68.)
Change-Id: I532687b6a5ee37dab28befb8e0eb05c22cbecf0f
Reviewed-on: https://gerrit.libreoffice.org/84124
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/configuration.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/threadex.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx index 237ad3e317c9..cb2ad5675660 100644 --- a/include/comphelper/configuration.hxx +++ b/include/comphelper/configuration.hxx @@ -162,7 +162,7 @@ template< typename T > struct Convert< boost::optional< T > > { static css::uno::Any toAny(boost::optional< T > const & value) { return value - ? css::uno::makeAny(value.get()) + ? css::uno::makeAny(*value) : css::uno::Any(); } diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 01d6170fbbe5..05d0bada3f58 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -71,7 +71,7 @@ private: virtual void doIt() override { try { - m_result.reset( m_func() ); + m_result = m_func(); } catch (...) { m_exc = std::current_exception(); |