From f05f4e042ca6ac8ae7f1d1e8e6bfb4cbba17a044 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sun, 19 Aug 2018 08:53:29 +0200 Subject: loplugin:useuniqueptr in SvpSalInstance Change-Id: I8cab3c63ba4dcd08488d0fb34d689692d5cf97f9 Reviewed-on: https://gerrit.libreoffice.org/59347 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/headless/svpdata.cxx | 3 ++- vcl/headless/svpinst.cxx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'vcl/headless') diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index ce72305f85d9..9ca2c72fc6fa 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -9,6 +9,7 @@ #include #include +#include class SvpSalData : public GenericUnixSalData { @@ -21,7 +22,7 @@ public: // plugin factory function SalInstance* svp_create_SalInstance() { - SvpSalInstance* pInstance = new SvpSalInstance( new SvpSalYieldMutex() ); + SvpSalInstance* pInstance = new SvpSalInstance( o3tl::make_unique() ); new SvpSalData( pInstance ); return pInstance; } diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 5e0ec4c80b50..5cfd6247d897 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -63,8 +63,8 @@ static void atfork_child() #endif -SvpSalInstance::SvpSalInstance( SalYieldMutex *pMutex ) - : SalGenericInstance( pMutex ) +SvpSalInstance::SvpSalInstance( std::unique_ptr pMutex ) + : SalGenericInstance( std::move(pMutex) ) { m_aTimeout.tv_sec = 0; m_aTimeout.tv_usec = 0; -- cgit