summaryrefslogtreecommitdiffstats
path: root/bridges
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-01-13 15:13:32 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-16 07:20:49 +0100
commite48e063254caa7eb26b5c3c50fd64236d59ed553 (patch)
treedf7519af69e3d8c016cf1d0823bc1365afacc6ce /bridges
parentFix iterator boundary (diff)
downloadcore-e48e063254caa7eb26b5c3c50fd64236d59ed553.tar.gz
core-e48e063254caa7eb26b5c3c50fd64236d59ed553.zip
o3tl::make_unique -> std::make_unique in basctl...bridges
Since it is now possible to use C++14, it's time to replace the temporary solution with the standard one Change-Id: I9a20a58c68d12656359dcaa060d8ab41f621af32 Reviewed-on: https://gerrit.libreoffice.org/66262 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
index 038f88f1d18e..350e5df4e6a2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/rtti.cxx
@@ -28,7 +28,6 @@
#include <dlfcn.h>
-#include <o3tl/make_unique.hxx>
#include <osl/mutex.hxx>
#include <rtl/instance.hxx>
#include <rtl/strbuf.hxx>
@@ -210,7 +209,7 @@ std::type_info * RTTI::getRTTI(typelib_TypeDescription const & pTypeDescr)
default:
{
m_rttiNames.emplace_back(OString(rttiName));
- auto pad = o3tl::make_unique<char[]>(
+ auto pad = std::make_unique<char[]>(
sizeof (__cxxabiv1::__vmi_class_type_info)
+ ((itd.nBaseTypes - 1)
* sizeof (