diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-04 20:41:49 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-08 12:30:06 +0100 |
| commit | 43635b474cdce65e64fa9ca9d27a3cee6d96d50b (patch) | |
| tree | 04d4223ebf161e2dc83f0842a1a81cef76d784d6 /vcl/headless | |
| parent | 2d6313a9fac81340883b24fe3651781d31c6039d (diff) | |
o3tl::make_unique -> std::make_unique in tools..xmloff
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: Ib3201f865d43f372007cdf381c7e244e9cbeae26
Reviewed-on: https://gerrit.libreoffice.org/67474
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'vcl/headless')
| -rw-r--r-- | vcl/headless/headlessinst.cxx | 3 | ||||
| -rw-r--r-- | vcl/headless/svpdata.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/vcl/headless/headlessinst.cxx b/vcl/headless/headlessinst.cxx index 28993b250d3e..c1bf1a7b7294 100644 --- a/vcl/headless/headlessinst.cxx +++ b/vcl/headless/headlessinst.cxx @@ -9,7 +9,6 @@ #include <headless/svpinst.hxx> #include <headless/svpdummies.hxx> #include <unx/gendata.hxx> -#include <o3tl/make_unique.hxx> class HeadlessSalInstance : public SvpSalInstance { @@ -86,7 +85,7 @@ SalData::~SalData() // This is our main entry point: SalInstance *CreateSalInstance() { - HeadlessSalInstance* pInstance = new HeadlessSalInstance(o3tl::make_unique<SvpSalYieldMutex>()); + HeadlessSalInstance* pInstance = new HeadlessSalInstance(std::make_unique<SvpSalYieldMutex>()); new HeadlessSalData( pInstance ); pInstance->AcquireYieldMutex(); return pInstance; diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index 9ca2c72fc6fa..313786ad793e 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -9,7 +9,6 @@ #include <unx/gendata.hxx> #include <headless/svpinst.hxx> -#include <o3tl/make_unique.hxx> class SvpSalData : public GenericUnixSalData { @@ -22,7 +21,7 @@ public: // plugin factory function SalInstance* svp_create_SalInstance() { - SvpSalInstance* pInstance = new SvpSalInstance( o3tl::make_unique<SvpSalYieldMutex>() ); + SvpSalInstance* pInstance = new SvpSalInstance( std::make_unique<SvpSalYieldMutex>() ); new SvpSalData( pInstance ); return pInstance; } |