diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-07-25 17:00:05 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-07-26 13:07:02 +0200 |
| commit | 273ca4e3c537d3ae49b1fe6ce565fc24d3a55cee (patch) | |
| tree | 99d26f0222688152f0d775d187ca6d11404a1a0b /searchlib | |
| parent | 2d54ab0044cfbbe550d100a3cc2d4952a5fcfb2a (diff) | |
= default and std::make_unique
Diffstat (limited to 'searchlib')
| -rw-r--r-- | searchlib/src/vespa/searchlib/attribute/posting_list_merger.cpp | 4 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/searchlib/src/vespa/searchlib/attribute/posting_list_merger.cpp b/searchlib/src/vespa/searchlib/attribute/posting_list_merger.cpp index d022e806b91..39ca733eae7 100644 --- a/searchlib/src/vespa/searchlib/attribute/posting_list_merger.cpp +++ b/searchlib/src/vespa/searchlib/attribute/posting_list_merger.cpp @@ -15,9 +15,7 @@ PostingListMerger<DataT>::PostingListMerger(uint32_t docIdLimit) } template <typename DataT> -PostingListMerger<DataT>::~PostingListMerger() -{ -} +PostingListMerger<DataT>::~PostingListMerger() = default; template <typename DataT> void diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp index cfad425d7ea..cf9450cbcca 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.hpp @@ -30,7 +30,7 @@ PostingListSearchContextT(const Dictionary &dictionary, uint32_t docIdLimit, uin } template <typename DataT> -PostingListSearchContextT<DataT>::~PostingListSearchContextT() {} +PostingListSearchContextT<DataT>::~PostingListSearchContextT() = default; template <typename DataT> @@ -154,7 +154,7 @@ createPostingIterator(fef::TermFieldMatchData *matchData, bool strict) { assert(_fetchPostingsDone); if (_uniqueValues == 0u) { - return SearchIterator::UP(new EmptySearch()); + return std::make_unique<EmptySearch>(); } if (_merger.hasArray() || _merger.hasBitVector()) { // synthetic results are available if (!_merger.emptyArray()) { @@ -170,7 +170,7 @@ createPostingIterator(fef::TermFieldMatchData *matchData, bool strict) } } if (_merger.hasArray()) { - return SearchIterator::UP(new EmptySearch()); + return std::make_unique<EmptySearch>(); } const BitVector *bv(_merger.getBitVector()); assert(bv != nullptr); @@ -181,7 +181,7 @@ createPostingIterator(fef::TermFieldMatchData *matchData, bool strict) return BitVectorIterator::create(_gbv, std::min(_gbv->size(), _docIdLimit), *matchData, strict); } if (!_pidx.valid()) { - return SearchIterator::UP(new EmptySearch()); + return std::make_unique<EmptySearch>(); } const PostingList &postingList = _postingList; if (!_frozenRoot.valid()) { |