summaryrefslogtreecommitdiff
path: root/package/source/zipapi/ZipFile.cxx
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-01-21 21:26:50 +0100
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-01-22 08:38:28 +0100
commit0c64df243259f574daaa4bc03bc4ddcc791c9073 (patch)
tree657a489d604ae2f7938369ef1789e746df0a3e69 /package/source/zipapi/ZipFile.cxx
parentfd8a724d22c92e3ebef4a3da126baaac3d3bde79 (diff)
o3tl::make_unique -> std::make_unique in i18npool...reportdesign
Since it is now possible to use C++14, it's time to replace the temporary solution with the standard one Change-Id: I8bee1344f7df82536f31bc5e4ec4fd379cac1d04 Reviewed-on: https://gerrit.libreoffice.org/66704 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package/source/zipapi/ZipFile.cxx')
-rw-r--r--package/source/zipapi/ZipFile.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx
index 60bdced74b5a..4f3092e56755 100644
--- a/package/source/zipapi/ZipFile.cxx
+++ b/package/source/zipapi/ZipFile.cxx
@@ -33,7 +33,6 @@
#include <rtl/digest.h>
#include <sal/log.hxx>
#include <osl/diagnose.h>
-#include <o3tl/make_unique.hxx>
#include <algorithm>
#include <iterator>
@@ -648,7 +647,7 @@ uno::Reference< XInputStream > ZipFile::createStreamForZipEntry(
std::unique_ptr<ZipEnumeration> ZipFile::entries()
{
- return o3tl::make_unique<ZipEnumeration>(aEntries);
+ return std::make_unique<ZipEnumeration>(aEntries);
}
uno::Reference< XInputStream > ZipFile::getInputStream( ZipEntry& rEntry,