summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-09-21 14:31:10 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-09-21 14:31:10 +0000
commit3458b497e559260cfd64cb5f908283ab41b00088 (patch)
treece8192c8b896dc77692eb7a8819270e8caf146ca /searchcore
parent37028564a00ed82c3ae2a90f005fcbbf19066a08 (diff)
Use std::make_xxx
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp2
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp14
2 files changed, 8 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
index fd8ce978d43..fc2a4326ccc 100644
--- a/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/combiningfeedview/combiningfeedview_test.cpp
@@ -99,7 +99,7 @@ struct MySubDb
MySubDb(const std::shared_ptr<const DocumentTypeRepo> &repo,
std::shared_ptr<BucketDBOwner> bucketDB,
SubDbType subDbType)
- : _view(new MyFeedView(repo, bucketDB, subDbType))
+ : _view(std::make_shared<MyFeedView>(repo, std::move(bucketDB), subDbType))
{
}
void insertDocs(const test::BucketDocuments &docs) {
diff --git a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
index d69f0365fc0..d94bb2e3d03 100644
--- a/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/maintenance_jobs_injector.cpp
@@ -35,13 +35,13 @@ injectLidSpaceCompactionJobs(MaintenanceController &controller,
const std::shared_ptr<IBucketStateCalculator> &calc)
{
for (auto &lidHandler : lscHandlers) {
- IMaintenanceJob::UP job = IMaintenanceJob::UP
- (new LidSpaceCompactionJob(config.getLidSpaceCompactionConfig(),
- *lidHandler, opStorer, fbHandler,
- diskMemUsageNotifier,
- config.getBlockableJobConfig(),
- clusterStateChangedNotifier,
- (calc ? calc->nodeRetired() : false)));
+ IMaintenanceJob::UP job = std::make_unique<LidSpaceCompactionJob>(
+ config.getLidSpaceCompactionConfig(),
+ *lidHandler, opStorer, fbHandler,
+ diskMemUsageNotifier,
+ config.getBlockableJobConfig(),
+ clusterStateChangedNotifier,
+ (calc ? calc->nodeRetired() : false));
controller.registerJobInMasterThread(trackJob(tracker, std::move(job)));
}
}