diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-04-13 11:14:32 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-04-13 11:14:32 +0000 |
commit | dc0749ac55dd56da57327642d3b3a679a96da900 (patch) | |
tree | 462c15a90c81f39c1bb4070f9c0572065a850afb /searchlib | |
parent | 21c6ae65e3fc2899c548ff36b5364e0e289dfc90 (diff) |
Minor c++11 code cleanup.
Diffstat (limited to 'searchlib')
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp | 18 | ||||
-rw-r--r-- | searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp index 9f01ce0cf9f..db3df4648c7 100644 --- a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp +++ b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.cpp @@ -35,7 +35,7 @@ FixedSourceSelector::Iterator::Iterator(const FixedSourceSelector & sourceSelect FixedSourceSelector::FixedSourceSelector(queryeval::Source defaultSource, const vespalib::string & attrBaseFileName, uint32_t initialNumDocs) : - SourceSelector(defaultSource, AttributeVector::SP(new SourceStore(attrBaseFileName, getConfig()))), + SourceSelector(defaultSource, std::make_shared<SourceStore>(attrBaseFileName, getConfig())), _source(static_cast<SourceStore &>(*_realSource)) { if (initialNumDocs != std::numeric_limits<uint32_t>::max()) { @@ -44,16 +44,13 @@ FixedSourceSelector::FixedSourceSelector(queryeval::Source defaultSource, } } -FixedSourceSelector::~FixedSourceSelector() -{ -} +FixedSourceSelector::~FixedSourceSelector() = default; FixedSourceSelector::UP -FixedSourceSelector::cloneAndSubtract(const vespalib::string & attrBaseFileName, - uint32_t diff) +FixedSourceSelector::cloneAndSubtract(const vespalib::string & attrBaseFileName, uint32_t diff) { queryeval::Source newDefault = getNewSource(getDefaultSource(), diff); - FixedSourceSelector::UP selector(new FixedSourceSelector(newDefault, attrBaseFileName, _source.getNumDocs()-1)); + auto selector = std::make_unique< FixedSourceSelector>(newDefault, attrBaseFileName, _source.getNumDocs()-1); for (uint32_t docId = 0; docId < _source.getNumDocs(); ++docId) { queryeval::Source src = _source.get(docId); src = getNewSource(src, diff); @@ -78,10 +75,9 @@ FixedSourceSelector::load(const vespalib::string & baseFileName, uint32_t curren (uint32_t) info->header()._defaultSource, defaultSource, baseFileName.c_str()); } - FixedSourceSelector::UP selector(new FixedSourceSelector( - defaultSource, - info->header()._baseFileName, - std::numeric_limits<uint32_t>::max())); + auto selector = std::make_unique<FixedSourceSelector>(defaultSource, + info->header()._baseFileName, + std::numeric_limits<uint32_t>::max()); selector->setBaseId(info->header()._baseId); selector->_source.load(); uint32_t cappedSources = capSelector(selector->_source, selector->getDefaultSource()); diff --git a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h index 055d216dda1..9cffe5b001b 100644 --- a/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h +++ b/searchlib/src/vespa/searchlib/attribute/fixedsourceselector.h @@ -30,7 +30,7 @@ public: FixedSourceSelector(queryeval::Source defaultSource, const vespalib::string & attrBaseFileName, uint32_t initialNumDocs = 0); - ~FixedSourceSelector(); + ~FixedSourceSelector() override; FixedSourceSelector::UP cloneAndSubtract(const vespalib::string & attrBaseFileName, uint32_t diff); static FixedSourceSelector::UP load(const vespalib::string & baseFileName, uint32_t currentId); |