diff options
| -rw-r--r-- | compilerplugins/clang/unnecessaryoverride.cxx | 2 | ||||
| -rw-r--r-- | include/unotools/streamhelper.hxx | 3 | ||||
| -rw-r--r-- | unotools/source/streaming/streamhelper.cxx | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx index 10ab158b7d8d..5013894aa398 100644 --- a/compilerplugins/clang/unnecessaryoverride.cxx +++ b/compilerplugins/clang/unnecessaryoverride.cxx @@ -95,6 +95,8 @@ public: // HAVE_ODBC_ADMINISTRATION if (loplugin::isSamePathname(fn, SRCDIR "/dbaccess/source/ui/dlg/dsselect.cxx")) return false; + if (loplugin::isSamePathname(fn, SRCDIR "/unotools/source/streaming/streamhelper.cxx")) + return false; return true; } diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index 26c7aa37c2da..5d0a3792855b 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -57,6 +57,9 @@ public: virtual void SAL_CALL seek( sal_Int64 location ) override; virtual sal_Int64 SAL_CALL getPosition( ) override; virtual sal_Int64 SAL_CALL getLength( ) override; + + // workaround for Ubuntu 18.04 / Fedora 31 (Coverity VM) build with std::mutex; must not be inline! + virtual void SAL_CALL acquire() SAL_NOEXCEPT override; }; } // namespace utl diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx index 63820352179d..b5f07e6a6a7f 100644 --- a/unotools/source/streaming/streamhelper.cxx +++ b/unotools/source/streaming/streamhelper.cxx @@ -113,6 +113,11 @@ void SAL_CALL OInputStreamHelper::closeInput() m_xLockBytes = nullptr; } +void SAL_CALL OInputStreamHelper::acquire() SAL_NOEXCEPT +{ + cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable>::acquire(); +} + } // namespace utl /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |