diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-21 12:56:24 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-21 12:56:24 +0100 |
commit | e0fc11519ed0f7964d116ef6a85e203425c3501a (patch) | |
tree | f37de9c0a9b97ccc6c8e0396a870d3f0999b9504 /vsm | |
parent | bd4f8a9026cae7c517f05b36e992e7e7ec8cff3f (diff) |
FieldModifier::LP -> FieldModifier::UP
Diffstat (limited to 'vsm')
-rw-r--r-- | vsm/src/vespa/vsm/common/fieldmodifier.h | 5 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/snippetmodifier.cpp | 12 |
2 files changed, 7 insertions, 10 deletions
diff --git a/vsm/src/vespa/vsm/common/fieldmodifier.h b/vsm/src/vespa/vsm/common/fieldmodifier.h index e38166bd680..e84ff191576 100644 --- a/vsm/src/vespa/vsm/common/fieldmodifier.h +++ b/vsm/src/vespa/vsm/common/fieldmodifier.h @@ -2,7 +2,6 @@ #pragma once #include <vespa/document/fieldvalue/fieldvalue.h> -#include <vespa/vespalib/util/linkedptr.h> #include <vespa/vsm/common/document.h> namespace vsm { @@ -13,7 +12,7 @@ namespace vsm { class FieldModifier { public: - typedef vespalib::LinkedPtr<FieldModifier> LP; + typedef std::unique_ptr<FieldModifier> UP; /** * Modifies the given field value and returns a new one. @@ -30,7 +29,7 @@ public: virtual ~FieldModifier() { } }; -typedef vespalib::hash_map<FieldIdT, FieldModifier::LP> FieldModifierMapT; +typedef vespalib::hash_map<FieldIdT, FieldModifier::UP> FieldModifierMapT; /** * This class wraps a map from field id to field modifier. diff --git a/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp b/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp index 910b087f4b9..b05cf177b92 100644 --- a/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp +++ b/vsm/src/vespa/vsm/vsm/snippetmodifier.cpp @@ -114,8 +114,7 @@ SnippetModifierManager::setup(const QueryTermList & queryTerms, LOG(debug, "Create snippet modifier for field id '%u'", fId); UTF8SubstringSnippetModifier::SP searcher (new UTF8SubstringSnippetModifier(fId, _searchModifyBuf, _searchOffsetBuf)); - FieldModifier::LP modifier(new SnippetModifier(searcher, _modifierBuf)); - _modifiers.map()[fId] = modifier; + _modifiers.map()[fId] = std::make_unique<SnippetModifier>(searcher, _modifierBuf); } } } @@ -123,11 +122,10 @@ SnippetModifierManager::setup(const QueryTermList & queryTerms, } // prepare modifiers - for (FieldModifierMapT::iterator itr = _modifiers.map().begin(); itr != _modifiers.map().end(); ++itr) { - FieldIdT fId = itr->first; - const FieldModifier::LP & fmod = itr->second; - SnippetModifier * smod = static_cast<SnippetModifier *>(fmod.get()); - smod->getSearcher()->prepare(fqtm[fId], _searchBuf); + for (auto & entry : _modifiers.map()) { + FieldIdT fId = entry.first; + SnippetModifier & smod = static_cast<SnippetModifier &>(*entry.second); + smod.getSearcher()->prepare(fqtm[fId], _searchBuf); } } |