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/unx/gtk | |
| 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/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index feac1816ddd2..f02ab9609014 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -37,7 +37,6 @@ #include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <rtl/uri.hxx> -#include <o3tl/make_unique.hxx> #include <vcl/settings.hxx> @@ -110,7 +109,7 @@ extern "C" gdk_threads_set_lock_functions (GdkThreadsEnter, GdkThreadsLeave); SAL_INFO("vcl.gtk", "Hooked gdk threads locks"); - auto pYieldMutex = o3tl::make_unique<GtkYieldMutex>(); + auto pYieldMutex = std::make_unique<GtkYieldMutex>(); gdk_threads_init(); @@ -347,7 +346,7 @@ std::unique_ptr<SalVirtualDevice> GtkInstance::CreateVirtualDevice( SalGraphics GtkSalGraphics *pGtkSalGraphics = dynamic_cast<GtkSalGraphics*>(pG); assert(pGtkSalGraphics); return CreateX11VirtualDevice(pG, nDX, nDY, eFormat, pGd, - o3tl::make_unique<GtkSalGraphics>(pGtkSalGraphics->GetGtkFrame(), + std::make_unique<GtkSalGraphics>(pGtkSalGraphics->GetGtkFrame(), pGtkSalGraphics->GetGtkWidget(), pGtkSalGraphics->GetScreenNumber())); #endif |