diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-22 09:19:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-22 09:19:59 +0200 |
| commit | c658fd4609c05617c785870b00aa3a0998375cc6 (patch) | |
| tree | f1811dea726471cd277161c9443945b1d2aa5c96 /vcl | |
| parent | 566050c5f3f3e54bfec115f9dba693404ca91770 (diff) | |
fix android build
after
commit f05f4e042ca6ac8ae7f1d1e8e6bfb4cbba17a044
Date: Sun Aug 19 08:53:29 2018 +0200
loplugin:useuniqueptr in SvpSalInstance
Change-Id: I0479139c28b88c049a4584c825a28217fa20b7c0
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/android/androidinst.cxx | 7 | ||||
| -rw-r--r-- | vcl/inc/android/androidinst.hxx | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx index 8946ff330b38..42830ef66dbf 100644 --- a/vcl/android/androidinst.cxx +++ b/vcl/android/androidinst.cxx @@ -17,6 +17,7 @@ #include <headless/svpdummies.hxx> #include <unx/gendata.hxx> #include <osl/detail/android-bootstrap.h> +#include <o3tl/make_unique.hxx> #include <rtl/strbuf.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -54,8 +55,8 @@ AndroidSalInstance *AndroidSalInstance::getInstance() return static_cast<AndroidSalInstance *>(pData->m_pInstance); } -AndroidSalInstance::AndroidSalInstance( SalYieldMutex *pMutex ) - : SvpSalInstance( pMutex ) +AndroidSalInstance::AndroidSalInstance( std::unique_ptr<SalYieldMutex> pMutex ) + : SvpSalInstance( std::move(pMutex) ) { int res = (lo_get_javavm())->AttachCurrentThread(&m_pJNIEnv, NULL); LOGI("AttachCurrentThread res=%d env=%p", res, m_pJNIEnv); @@ -191,7 +192,7 @@ SalData::~SalData() SalInstance *CreateSalInstance() { LOGI("Android: CreateSalInstance!"); - AndroidSalInstance* pInstance = new AndroidSalInstance( new SvpSalYieldMutex() ); + AndroidSalInstance* pInstance = new AndroidSalInstance( o3tl::make_unique<SvpSalYieldMutex>() ); new AndroidSalData( pInstance ); pInstance->AcquireYieldMutex(); return pInstance; diff --git a/vcl/inc/android/androidinst.hxx b/vcl/inc/android/androidinst.hxx index 30673ac8bd72..49758f3efd70 100644 --- a/vcl/inc/android/androidinst.hxx +++ b/vcl/inc/android/androidinst.hxx @@ -25,7 +25,7 @@ class AndroidSalInstance : public SvpSalInstance JNIEnv *m_pJNIEnv; public: - AndroidSalInstance( SalYieldMutex *pMutex ); + AndroidSalInstance( std::unique_ptr<SalYieldMutex> pMutex ); virtual ~AndroidSalInstance(); static AndroidSalInstance *getInstance(); |