diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-14 18:10:18 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-20 12:59:28 +0100 |
| commit | 5082a2b3a9958cd106472bec638aaf614240f742 (patch) | |
| tree | cb9889368ccf3a000d277683571741fe186ff297 /o3tl | |
| parent | minimumSize is overwritten so CalcMinimumSize is unused (diff) | |
| download | core-5082a2b3a9958cd106472bec638aaf614240f742.tar.gz core-5082a2b3a9958cd106472bec638aaf614240f742.zip | |
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@collabora.com>
Diffstat (limited to 'o3tl')
| -rw-r--r-- | o3tl/qa/test-sorted_vector.cxx | 17 |
1 files changed, 8 insertions, 9 deletions
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] ); |