[Libreoffice-commits] core.git: basctl/inc basic/inc fpicker/source include/sfx2 include/svx o3tl/qa sccomp/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Feb 20 11:59:59 UTC 2019
basctl/inc/pch/precompiled_basctl.hxx | 1 -
basic/inc/pch/precompiled_sb.hxx | 1 -
fpicker/source/aqua/resourceprovider.mm | 1 -
fpicker/source/win32/resourceprovider.cxx | 1 -
include/sfx2/childwin.hxx | 1 -
include/svx/ClassificationField.hxx | 1 -
o3tl/qa/test-sorted_vector.cxx | 17 ++++++++---------
sccomp/source/solver/SwarmSolver.cxx | 1 -
8 files changed, 8 insertions(+), 16 deletions(-)
New commits:
commit 5082a2b3a9958cd106472bec638aaf614240f742
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Thu Feb 14 18:10:18 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Feb 20 12:59:28 2019 +0100
o3tl::make_unique -> std::make_unique in include/ & o3tl/
Also the last few remaining occurrences of the header
Since it is now possible to use C++14, it's time to replace
the temporary solution with the standard one
Change-Id: I18f435270057f2d09e21d6ea262532cbcc974598
Reviewed-on: https://gerrit.libreoffice.org/67843
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 61e03945be69..2bce4900e2d7 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -390,7 +390,6 @@
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/enumarray.hxx>
-#include <o3tl/make_unique.hxx>
#include <o3tl/sorted_vector.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx
index a6177f48f86c..e79b7824c73f 100644
--- a/basic/inc/pch/precompiled_sb.hxx
+++ b/basic/inc/pch/precompiled_sb.hxx
@@ -69,7 +69,6 @@
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/cow_wrapper.hxx>
-#include <o3tl/make_unique.hxx>
#include <sbobjmod.hxx>
#include <sbxbase.hxx>
#include <svl/SfxBroadcaster.hxx>
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index 3ad1714aa2ed..b5ec09532ea2 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -19,7 +19,6 @@
#include <sal/config.h>
-#include <o3tl/make_unique.hxx>
#include <osl/diagnose.h>
#include <rtl/ustrbuf.hxx>
#include <osl/mutex.hxx>
diff --git a/fpicker/source/win32/resourceprovider.cxx b/fpicker/source/win32/resourceprovider.cxx
index 4d0d76e0f997..cab15018ca84 100644
--- a/fpicker/source/win32/resourceprovider.cxx
+++ b/fpicker/source/win32/resourceprovider.cxx
@@ -21,7 +21,6 @@
#include <memory>
-#include <o3tl/make_unique.hxx>
#include <rtl/ustrbuf.hxx>
#include "resourceprovider.hxx"
#include <osl/mutex.hxx>
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index a56e137cca85..b07c6d1cd983 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -24,7 +24,6 @@
#include <sfx2/dllapi.h>
#include <sal/types.h>
-#include <o3tl/make_unique.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <vcl/window.hxx>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/include/svx/ClassificationField.hxx b/include/svx/ClassificationField.hxx
index 31e033965621..d1303164b265 100644
--- a/include/svx/ClassificationField.hxx
+++ b/include/svx/ClassificationField.hxx
@@ -14,7 +14,6 @@
#include <sal/config.h>
#include <svx/svxdllapi.h>
#include <editeng/flditem.hxx>
-#include <o3tl/make_unique.hxx>
namespace svx {
diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index dd622e0cea0d..92fab00cd186 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -12,7 +12,6 @@
#include <cppunit/TestFixture.h>
#include <cppunit/extensions/HelperMacros.h>
-#include <o3tl/make_unique.hxx>
#include <o3tl/sorted_vector.hxx>
#include <rtl/ustring.hxx>
@@ -256,10 +255,10 @@ public:
{
o3tl::sorted_vector<std::unique_ptr<OUString>, o3tl::less_uniqueptr_to<OUString>> aVec;
- auto str_c = aVec.insert(o3tl::make_unique<OUString>("c")).first->get();
- auto str_b1 = aVec.insert(o3tl::make_unique<OUString>("b")).first->get();
- CPPUNIT_ASSERT(!aVec.insert(o3tl::make_unique<OUString>("b")).second);
- aVec.insert(o3tl::make_unique<OUString>("a"));
+ auto str_c = aVec.insert(std::make_unique<OUString>("c")).first->get();
+ auto str_b1 = aVec.insert(std::make_unique<OUString>("b")).first->get();
+ CPPUNIT_ASSERT(!aVec.insert(std::make_unique<OUString>("b")).second);
+ aVec.insert(std::make_unique<OUString>("a"));
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(3), aVec.size() );
CPPUNIT_ASSERT_EQUAL( OUString("a"), *aVec[0] );
CPPUNIT_ASSERT_EQUAL( OUString("b"), *aVec[1] );
@@ -279,10 +278,10 @@ public:
o3tl::sorted_vector<std::unique_ptr<OUString>, o3tl::less_uniqueptr_to<OUString>,
o3tl::find_partialorder_ptrequals> aVec;
- auto str_c = aVec.insert(o3tl::make_unique<OUString>("c")).first->get();
- auto str_b1 = aVec.insert(o3tl::make_unique<OUString>("b")).first->get();
- auto str_b2 = aVec.insert(o3tl::make_unique<OUString>("b")).first->get();
- aVec.insert(o3tl::make_unique<OUString>("a"));
+ auto str_c = aVec.insert(std::make_unique<OUString>("c")).first->get();
+ auto str_b1 = aVec.insert(std::make_unique<OUString>("b")).first->get();
+ auto str_b2 = aVec.insert(std::make_unique<OUString>("b")).first->get();
+ aVec.insert(std::make_unique<OUString>("a"));
CPPUNIT_ASSERT_EQUAL( static_cast<size_t>(4), aVec.size() );
CPPUNIT_ASSERT_EQUAL( OUString("a"), *aVec[0] );
CPPUNIT_ASSERT_EQUAL( OUString("b"), *aVec[1] );
diff --git a/sccomp/source/solver/SwarmSolver.cxx b/sccomp/source/solver/SwarmSolver.cxx
index 11d1cb2e8f18..ac2d15bd29d1 100644
--- a/sccomp/source/solver/SwarmSolver.cxx
+++ b/sccomp/source/solver/SwarmSolver.cxx
@@ -35,7 +35,6 @@
#include <limits>
#include <chrono>
#include <random>
-#include <o3tl/make_unique.hxx>
#include <unotools/resmgr.hxx>
More information about the Libreoffice-commits
mailing list