diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-12-21 14:36:55 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2022-12-21 15:49:53 +0000 |
commit | b5d69b996aec4375bae0c640405b4037784da22b (patch) | |
tree | d3a22800088d9c24356733dcebfec7fb1aae8709 /streamingvisitors | |
parent | 55d657fd18be4dab7fe174587696de45fbc23f06 (diff) |
Change from typedef to using in streamingvisitors C++ code.
Diffstat (limited to 'streamingvisitors')
26 files changed, 74 insertions, 74 deletions
diff --git a/streamingvisitors/src/tests/docsum/docsum.cpp b/streamingvisitors/src/tests/docsum/docsum.cpp index cff43adbb3a..b99ee360bee 100644 --- a/streamingvisitors/src/tests/docsum/docsum.cpp +++ b/streamingvisitors/src/tests/docsum/docsum.cpp @@ -21,8 +21,8 @@ public: Vector<T> & add(T v) { this->push_back(v); return *this; } }; -typedef Vector<std::string> StringList; -typedef Vector<std::pair<std::string, int32_t> > WeightedStringList; +using StringList = Vector<std::string>; +using WeightedStringList = Vector<std::pair<std::string, int32_t> >; class TestDocument : public vsm::Document diff --git a/streamingvisitors/src/tests/searcher/searcher_test.cpp b/streamingvisitors/src/tests/searcher/searcher_test.cpp index b322c1a33fc..607e418ac83 100644 --- a/streamingvisitors/src/tests/searcher/searcher_test.cpp +++ b/streamingvisitors/src/tests/searcher/searcher_test.cpp @@ -32,14 +32,14 @@ public: Vector<T> & add(T v) { this->push_back(v); return *this; } }; -typedef Vector<size_t> Hits; -typedef Vector<std::string> StringList; -typedef Vector<Hits> HitsList; -typedef Vector<bool> BoolList; -typedef Vector<int64_t> LongList; -typedef Vector<float> FloatList; -typedef QueryTerm::FieldInfo QTFieldInfo; -typedef Vector<QTFieldInfo> FieldInfoList; +using Hits = Vector<size_t>; +using StringList = Vector<std::string> ; +using HitsList = Vector<Hits>; +using BoolList = Vector<bool>; +using LongList = Vector<int64_t>; +using FloatList = Vector<float>; +using QTFieldInfo = QueryTerm::FieldInfo; +using FieldInfoList = Vector<QTFieldInfo>; class String { @@ -66,8 +66,8 @@ private: } } public: - typedef std::pair<std::string, std::string> ParsedQueryTerm; - typedef std::pair<std::string, TermType> ParsedTerm; + using ParsedQueryTerm = std::pair<std::string, std::string>; + using ParsedTerm = std::pair<std::string, TermType>; QueryNodeResultFactory eqnr; std::vector<QueryTerm::UP> qtv; QueryTermList qtl; diff --git a/streamingvisitors/src/tests/textutil/textutil.cpp b/streamingvisitors/src/tests/textutil/textutil.cpp index 2a1390eaa01..160c734ee20 100644 --- a/streamingvisitors/src/tests/textutil/textutil.cpp +++ b/streamingvisitors/src/tests/textutil/textutil.cpp @@ -19,10 +19,10 @@ public: Vector<T> & a(T v) { this->push_back(v); return *this; } }; -typedef Vector<ucs4_t> UCS4V; -typedef Vector<size_t> SizeV; -typedef UTF8StringFieldSearcherBase SFSB; -typedef FUTF8StrChrFieldSearcher FSFS; +using UCS4V = Vector<ucs4_t>; +using SizeV = Vector<size_t>; +using SFSB = UTF8StringFieldSearcherBase; +using FSFS = FUTF8StrChrFieldSearcher; class TextUtilTest : public vespalib::TestApp { diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.h b/streamingvisitors/src/vespa/searchvisitor/hitcollector.h index d6a05dc4f9e..6ce7459adfd 100644 --- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.h +++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.h @@ -70,7 +70,7 @@ private: std::vector<search::fef::TermFieldMatchData> _matchData; vespalib::string _sortBlob; }; - typedef std::vector<Hit> HitVector; + using HitVector = std::vector<Hit>; HitVector _hits; bool _sortedByDocId; // flag for whether the hit vector is sorted on docId @@ -79,7 +79,7 @@ private: bool addHit(Hit && hit); public: - typedef std::unique_ptr<HitCollector> UP; + using UP = std::unique_ptr<HitCollector>; struct IRankProgram { virtual ~IRankProgram() {} diff --git a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h index 3bcf1cc43a5..2cc5a450b2e 100644 --- a/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/indexenvironment.h @@ -21,7 +21,7 @@ namespace streaming { class IndexEnvironment : public search::fef::IIndexEnvironment { private: - typedef vespalib::hash_map<vespalib::string, uint32_t> StringInt32Map; + using StringInt32Map = vespalib::hash_map<vespalib::string, uint32_t>; const search::fef::ITableManager * _tableManager; search::fef::Properties _properties; std::vector<search::fef::FieldInfo> _fields; diff --git a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h index 1bc625f4ea3..dd543a60244 100644 --- a/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/queryenvironment.h @@ -25,7 +25,7 @@ private: std::vector<search::common::GeoLocationSpec> _locations; public: - typedef std::unique_ptr<QueryEnvironment> UP; + using UP = std::unique_ptr<QueryEnvironment>; QueryEnvironment(const vespalib::string & location, const IndexEnvironment & indexEnv, diff --git a/streamingvisitors/src/vespa/searchvisitor/querywrapper.h b/streamingvisitors/src/vespa/searchvisitor/querywrapper.h index 90343085298..32a9c5e7c57 100644 --- a/streamingvisitors/src/vespa/searchvisitor/querywrapper.h +++ b/streamingvisitors/src/vespa/searchvisitor/querywrapper.h @@ -50,7 +50,7 @@ public: bool isGeoPosTerm() const { return (_term != nullptr) && _term->isGeoLoc(); } }; - typedef std::vector<Term> TermList; + using TermList = std::vector<Term>; private: PhraseList _phraseList; diff --git a/streamingvisitors/src/vespa/searchvisitor/rankmanager.h b/streamingvisitors/src/vespa/searchvisitor/rankmanager.h index bdf839ab824..d600d905328 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankmanager.h +++ b/streamingvisitors/src/vespa/searchvisitor/rankmanager.h @@ -18,7 +18,7 @@ class RankManager { public: /** collection of field ids for an index **/ - typedef std::vector<uint32_t> View; + using View = std::vector<uint32_t>; /** * This class represents a snapshot of the rank-profiles config with associated setup per rank profile. @@ -26,9 +26,9 @@ public: **/ class Snapshot { private: - typedef std::pair<vespalib::string, search::fef::Properties> NamedPropertySet; - typedef vespalib::hash_map<vespalib::string, View> ViewMap; - typedef vespalib::hash_map<vespalib::string, int> Map; + using NamedPropertySet = std::pair<vespalib::string, search::fef::Properties>; + using ViewMap = vespalib::hash_map<vespalib::string, View>; + using Map = vespalib::hash_map<vespalib::string, int>; search::fef::TableManager _tableManager; IndexEnvironment _protoEnv; std::vector<NamedPropertySet> _properties; // property set per rank profile @@ -48,7 +48,7 @@ public: } public: - typedef std::shared_ptr<Snapshot> SP; + using SP = std::shared_ptr<Snapshot>; Snapshot(); ~Snapshot(); const std::vector<NamedPropertySet> & getProperties() const { return _properties; } diff --git a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h index 3a2a28b0ee5..c2b3d8adedf 100644 --- a/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h +++ b/streamingvisitors/src/vespa/searchvisitor/rankprocessor.h @@ -53,7 +53,7 @@ private: void unpackMatchData(search::fef::MatchData &matchData); public: - typedef std::unique_ptr<RankProcessor> UP; + using UP = std::unique_ptr<RankProcessor>; RankProcessor(RankManager::Snapshot::SP snapshot, const vespalib::string &rankProfile, diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h index f08dd6052f1..dfe1f986469 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h @@ -17,7 +17,7 @@ class SearchEnvironment : public storage::VisitorEnvironment private: class Env : public config::SimpleConfigurable { public: - typedef std::shared_ptr<Env> SP; + using SP = std::shared_ptr<Env>; Env(const vespalib::string & muffens, const config::ConfigUri & configUri, Fast_NormalizeWordFolder & wf); ~Env() override; const vsm::VSMAdapter * getVSMAdapter() const { return _vsmAdapter.get(); } @@ -31,9 +31,9 @@ private: std::unique_ptr<vsm::VSMAdapter> _vsmAdapter; std::unique_ptr<RankManager> _rankManager; }; - typedef vespalib::hash_map<vespalib::string, Env::SP> EnvMap; - typedef std::unique_ptr<EnvMap> EnvMapUP; - typedef std::vector<EnvMapUP> ThreadLocals; + using EnvMap = vespalib::hash_map<vespalib::string, Env::SP>; + using EnvMapUP = std::unique_ptr<EnvMap>; + using ThreadLocals = std::vector<EnvMapUP>; static __thread EnvMap * _localEnvMap; EnvMap _envMap; diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h index 7dbf1cd521b..06ab2eaeaaa 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h @@ -381,8 +381,8 @@ private: size_t _count; size_t _limit; }; - typedef std::vector< GroupingEntry > GroupingList; - typedef std::vector<vsm::StorageDocument::UP> DocumentVector; + using GroupingList = std::vector< GroupingEntry >; + using DocumentVector = std::vector<vsm::StorageDocument::UP>; class StreamingDocsumsState { using ResolveClassInfo = search::docsummary::IDocsumWriter::ResolveClassInfo; diff --git a/streamingvisitors/src/vespa/vsm/common/charbuffer.h b/streamingvisitors/src/vespa/vsm/common/charbuffer.h index 08618a9b973..137c4facf29 100644 --- a/streamingvisitors/src/vespa/vsm/common/charbuffer.h +++ b/streamingvisitors/src/vespa/vsm/common/charbuffer.h @@ -16,7 +16,7 @@ private: size_t _pos; public: - typedef std::shared_ptr<CharBuffer> SP; + using SP = std::shared_ptr<CharBuffer>; /** * Creates a char buffer with len bytes. diff --git a/streamingvisitors/src/vespa/vsm/common/document.h b/streamingvisitors/src/vespa/vsm/common/document.h index 8c11d27072b..de9ab052aa1 100644 --- a/streamingvisitors/src/vespa/vsm/common/document.h +++ b/streamingvisitors/src/vespa/vsm/common/document.h @@ -13,15 +13,15 @@ namespace vespalib { namespace vsm { /// Type to identify fields in documents. -typedef unsigned int FieldIdT; +using FieldIdT = unsigned int; /// A type to represent a list of FieldIds. -typedef std::vector<FieldIdT> FieldIdTList; +using FieldIdTList = std::vector<FieldIdT>; /// A type to represent all the fields contained in all the indexs. -typedef vespalib::hash_map<vespalib::string, FieldIdTList> IndexFieldMapT; +using IndexFieldMapT = vespalib::hash_map<vespalib::string, FieldIdTList>; /// A type to represent all the fields contained in all the indexs in an all the document types. -typedef vespalib::hash_map<vespalib::string, IndexFieldMapT> DocumentTypeIndexFieldMapT; +using DocumentTypeIndexFieldMapT = vespalib::hash_map<vespalib::string, IndexFieldMapT>; /// A type to represent a map from fieldname to fieldid. -typedef std::map<vespalib::string, FieldIdT> StringFieldIdTMapT; +using StringFieldIdTMapT = std::map<vespalib::string, FieldIdT>; class StringFieldIdTMap { @@ -38,7 +38,7 @@ class StringFieldIdTMap StringFieldIdTMapT _map; }; -typedef vespalib::stringref FieldRef; +using FieldRef = vespalib::stringref; /** This is the base class representing a document. It gives a document some diff --git a/streamingvisitors/src/vespa/vsm/common/documenttypemapping.h b/streamingvisitors/src/vespa/vsm/common/documenttypemapping.h index 607b40cec47..0ee641135b0 100644 --- a/streamingvisitors/src/vespa/vsm/common/documenttypemapping.h +++ b/streamingvisitors/src/vespa/vsm/common/documenttypemapping.h @@ -42,8 +42,8 @@ private: void buildFieldMap(const document::DocumentType *docType, const StringFieldIdTMapT & fieldList, const vespalib::string & typeId); - typedef vespalib::hash_map<vespalib::string, FieldPathMapT> FieldPathMapMapT; - typedef std::multimap<size_t, const document::DocumentType *> DocumentTypeUsage; + using FieldPathMapMapT = vespalib::hash_map<vespalib::string, FieldPathMapT>; + using DocumentTypeUsage = std::multimap<size_t, const document::DocumentType *>; FieldPathMapMapT _fieldMap; vespalib::string _defaultDocumentTypeName; const document::DocumentType *_defaultDocumentType; diff --git a/streamingvisitors/src/vespa/vsm/common/fieldmodifier.h b/streamingvisitors/src/vespa/vsm/common/fieldmodifier.h index 60e480fa237..9fec3a82277 100644 --- a/streamingvisitors/src/vespa/vsm/common/fieldmodifier.h +++ b/streamingvisitors/src/vespa/vsm/common/fieldmodifier.h @@ -12,7 +12,7 @@ namespace vsm { class FieldModifier { public: - typedef std::unique_ptr<FieldModifier> UP; + using UP = std::unique_ptr<FieldModifier>; /** * Modifies the given field value and returns a new one. @@ -29,7 +29,7 @@ public: virtual ~FieldModifier() { } }; -typedef vespalib::hash_map<FieldIdT, FieldModifier::UP> FieldModifierMapT; +using FieldModifierMapT = vespalib::hash_map<FieldIdT, FieldModifier::UP>; /** * This class wraps a map from field id to field modifier. diff --git a/streamingvisitors/src/vespa/vsm/common/storagedocument.h b/streamingvisitors/src/vespa/vsm/common/storagedocument.h index 0ac94157462..cc7eaf391f4 100644 --- a/streamingvisitors/src/vespa/vsm/common/storagedocument.h +++ b/streamingvisitors/src/vespa/vsm/common/storagedocument.h @@ -6,14 +6,14 @@ namespace vsm { -typedef vespalib::CloneablePtr<document::FieldValue> FieldValueContainer; -typedef document::FieldPath FieldPath; // field path to navigate a field value -typedef std::vector<FieldPath> FieldPathMapT; // map from field id to field path -typedef std::shared_ptr<FieldPathMapT> SharedFieldPathMap; +using FieldValueContainer = vespalib::CloneablePtr<document::FieldValue>; +using FieldPath = document::FieldPath; // field path to navigate a field value +using FieldPathMapT = std::vector<FieldPath>; // map from field id to field path +using SharedFieldPathMap = std::shared_ptr<FieldPathMapT>; class StorageDocument : public Document { public: - typedef std::unique_ptr<StorageDocument> UP; + using UP = std::unique_ptr<StorageDocument>; class SubDocument { public: diff --git a/streamingvisitors/src/vespa/vsm/config/vsm-cfif.h b/streamingvisitors/src/vespa/vsm/config/vsm-cfif.h index 22033aee232..4adefb31867 100644 --- a/streamingvisitors/src/vespa/vsm/config/vsm-cfif.h +++ b/streamingvisitors/src/vespa/vsm/config/vsm-cfif.h @@ -12,14 +12,14 @@ using vespa::config::search::vsm::VsmfieldsConfig; namespace vsm { -typedef vespalib::PtrHolder<VsmfieldsConfig> VsmfieldsHolder; -typedef std::shared_ptr<VsmfieldsConfig> VsmfieldsHandle; +using VsmfieldsHolder = vespalib::PtrHolder<VsmfieldsConfig>; +using VsmfieldsHandle = std::shared_ptr<VsmfieldsConfig>; -typedef vespalib::PtrHolder<VsmConfig> VsmHolder; -typedef std::shared_ptr<VsmConfig> VsmHandle; +using VsmHolder = vespalib::PtrHolder<VsmConfig>; +using VsmHandle = std::shared_ptr<VsmConfig>; -typedef vespalib::PtrHolder<VsmsummaryConfig> FastS_VsmsummaryHolder; -typedef std::shared_ptr<VsmsummaryConfig> FastS_VsmsummaryHandle; +using FastS_VsmsummaryHolder = vespalib::PtrHolder<VsmsummaryConfig>; +using FastS_VsmsummaryHandle = std::shared_ptr<VsmsummaryConfig>; } diff --git a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h index 5c2ef8fec28..bde23efad5a 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h +++ b/streamingvisitors/src/vespa/vsm/searcher/fieldsearcher.h @@ -8,8 +8,8 @@ namespace vsm { -typedef size_t termcount_t; -typedef size_t termsize_t; +using termcount_t = size_t; +using termsize_t = size_t; #if defined(COLLECT_CHAR_STAT) #define NEED_CHAR_STAT(a) { a; } @@ -17,10 +17,10 @@ typedef size_t termsize_t; #define NEED_CHAR_STAT(a) #endif -typedef ucs4_t cmptype_t; -typedef vespalib::Array<cmptype_t> SearcherBuf; -typedef std::shared_ptr<SearcherBuf> SharedSearcherBuf; -typedef std::vector<char> CharVector; +using cmptype_t = ucs4_t; +using SearcherBuf = vespalib::Array<cmptype_t>; +using SharedSearcherBuf = std::shared_ptr<SearcherBuf>; +using CharVector = std::vector<char>; class FieldSearcherBase { @@ -135,8 +135,8 @@ public: static search::byte _wordChar[256]; }; -typedef std::unique_ptr<FieldSearcher> FieldSearcherContainer; -typedef std::vector<FieldSearcherContainer> FieldIdTSearcherMapT; +using FieldSearcherContainer = std::unique_ptr<FieldSearcher>; +using FieldIdTSearcherMapT = std::vector<FieldSearcherContainer>; class FieldIdTSearcherMap : public FieldIdTSearcherMapT { diff --git a/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h index 98018fbf4a3..80f79fd6491 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h +++ b/streamingvisitors/src/vespa/vsm/searcher/floatfieldsearcher.h @@ -28,12 +28,12 @@ protected: T _upper; bool _valid; }; - typedef std::vector<FloatInfo> FloatInfoListT; + using FloatInfoListT = std::vector<FloatInfo>; FloatInfoListT _floatTerm; }; -typedef FloatFieldSearcherT<float> FloatFieldSearcherTF; -typedef FloatFieldSearcherT<double> FloatFieldSearcherTD; +using FloatFieldSearcherTF = FloatFieldSearcherT<float>; +using FloatFieldSearcherTD = FloatFieldSearcherT<double>; class FloatFieldSearcher : public FloatFieldSearcherTF { diff --git a/streamingvisitors/src/vespa/vsm/searcher/geo_pos_field_searcher.h b/streamingvisitors/src/vespa/vsm/searcher/geo_pos_field_searcher.h index ef1c5b5a1c4..307be1dacab 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/geo_pos_field_searcher.h +++ b/streamingvisitors/src/vespa/vsm/searcher/geo_pos_field_searcher.h @@ -21,7 +21,7 @@ protected: GeoPosInfo (GeoLocation loc) noexcept : GeoLocation(std::move(loc)) {} bool cmp(const document::StructFieldValue & fv) const; }; - typedef std::vector<GeoPosInfo> GeoPosInfoListT; + using GeoPosInfoListT = std::vector<GeoPosInfo>; GeoPosInfoListT _geoPosTerm; }; diff --git a/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h index a2b17a87f4b..6645a5d719a 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h +++ b/streamingvisitors/src/vespa/vsm/searcher/intfieldsearcher.h @@ -25,7 +25,7 @@ protected: int64_t _upper; bool _valid; }; - typedef std::vector<IntInfo> IntInfoListT; + using IntInfoListT = std::vector<IntInfo>; IntInfoListT _intTerm; }; diff --git a/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h index 0127a7f2827..4802619c3db 100644 --- a/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h +++ b/streamingvisitors/src/vespa/vsm/searcher/utf8substringsnippetmodifier.h @@ -6,7 +6,7 @@ namespace vsm { -typedef std::shared_ptr<std::vector<size_t> > SharedOffsetBuffer; +using SharedOffsetBuffer = std::shared_ptr<std::vector<size_t> >; /** * This class does substring searches the same way as UTF8SubStringFieldSearcher. @@ -47,7 +47,7 @@ private: void insertSeparators(const char * mbegin, const char * mend); public: - typedef std::shared_ptr<UTF8SubstringSnippetModifier> SP; + using SP = std::shared_ptr<UTF8SubstringSnippetModifier>; std::unique_ptr<FieldSearcher> duplicate() const override; diff --git a/streamingvisitors/src/vespa/vsm/vsm/docsumfieldspec.h b/streamingvisitors/src/vespa/vsm/vsm/docsumfieldspec.h index b576cb737eb..c75bace1cc7 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/docsumfieldspec.h +++ b/streamingvisitors/src/vespa/vsm/vsm/docsumfieldspec.h @@ -34,7 +34,7 @@ public: const FieldPath & getPath() const { return _path; } }; - typedef std::vector<FieldIdentifier> FieldIdentifierVector; + using FieldIdentifierVector = std::vector<FieldIdentifier>; private: bool _struct_or_multivalue; // property of the output field diff --git a/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.h b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.h index 7b78a8634e0..14a30ed8c36 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.h +++ b/streamingvisitors/src/vespa/vsm/vsm/fieldsearchspec.h @@ -39,7 +39,7 @@ private: bool _reconfigured; }; -typedef std::map<FieldIdT, FieldSearchSpec> FieldSearchSpecMapT; +using FieldSearchSpecMapT = std::map<FieldIdT, FieldSearchSpec>; class FieldSearchSpecMap { diff --git a/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp index f3956cbb11f..1993f1cf657 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp +++ b/streamingvisitors/src/vespa/vsm/vsm/snippetmodifier.cpp @@ -11,7 +11,7 @@ LOG_SETUP(".vsm.snippetmodifier"); using namespace document; using search::streaming::QueryTerm; using search::streaming::QueryTermList; -typedef vespalib::hash_map<vsm::FieldIdT, QueryTermList> FieldQueryTermMap; +using FieldQueryTermMap = vespalib::hash_map<vsm::FieldIdT, QueryTermList>; namespace { diff --git a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h index 63704b1c5a7..650a7121a2e 100644 --- a/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h +++ b/streamingvisitors/src/vespa/vsm/vsm/vsm-adapter.h @@ -88,7 +88,7 @@ public: const juniper::Juniper * getJuniper() const override { return _juniper.get(); } }; -typedef std::shared_ptr<DocsumTools> DocsumToolsPtr; +using DocsumToolsPtr = std::shared_ptr<DocsumTools>; class VSMConfigSnapshot { private: |