diff options
Diffstat (limited to 'searchcore/src/tests/proton')
5 files changed, 8 insertions, 10 deletions
diff --git a/searchcore/src/tests/proton/common/cachedselect_test.cpp b/searchcore/src/tests/proton/common/cachedselect_test.cpp index 9a9d491467c..02c5128a0a7 100644 --- a/searchcore/src/tests/proton/common/cachedselect_test.cpp +++ b/searchcore/src/tests/proton/common/cachedselect_test.cpp @@ -289,7 +289,7 @@ MyDB::addDoc(uint32_t lid, const Document & MyDB::getDoc(uint32_t lid) const { - LidToDocSP::const_iterator it(_lidToDocSP.find(lid)); + auto it = _lidToDocSP.find(lid); ASSERT_TRUE(it != _lidToDocSP.end()); return *it->second; } diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index fdfa7522350..62be83f5f51 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -239,12 +239,12 @@ struct MyDocumentStore : public test::DummyDocumentStore {} ~MyDocumentStore() override; Document::UP read(DocumentIdT lid, const document::DocumentTypeRepo &) const override { - DocMap::const_iterator itr = _docs.find(lid); + auto itr = _docs.find(lid); if (itr != _docs.end()) { Document::UP retval(itr->second->clone()); return retval; } - return Document::UP(); + return {}; } void write(uint64_t syncToken, DocumentIdT lid, const document::Document& doc) override { _lastSyncToken = syncToken; @@ -345,7 +345,7 @@ struct MyAttributeWriter : public IAttributeWriter if (_attrs.count(attrName) == 0) { return nullptr; } - AttrMap::const_iterator itr = _attrMap.find(attrName); + auto itr = _attrMap.find(attrName); return ((itr == _attrMap.end()) ? nullptr : itr->second.get()); } void put(SerialNum serialNum, const document::Document &doc, DocumentIdT lid, OnWriteDoneType) override { diff --git a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp index bf960768c89..aeaa35309b5 100644 --- a/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp +++ b/searchcore/src/tests/proton/documentdb/maintenancecontroller/maintenancecontroller_test.cpp @@ -193,7 +193,7 @@ struct MyBucketModifiedHandler : public IBucketModifiedHandler { BucketIdVector _modified; void notifyBucketModified(const BucketId &bucket) override { - BucketIdVector::const_iterator itr = std::find(_modified.begin(), _modified.end(), bucket); + auto itr = std::find(_modified.begin(), _modified.end(), bucket); if (itr == _modified.end()) { _modified.push_back(bucket); } diff --git a/searchcore/src/tests/proton/flushengine/flushengine_test.cpp b/searchcore/src/tests/proton/flushengine/flushengine_test.cpp index 6cdf0c478ad..2c589085a90 100644 --- a/searchcore/src/tests/proton/flushengine/flushengine_test.cpp +++ b/searchcore/src/tests/proton/flushengine/flushengine_test.cpp @@ -691,7 +691,7 @@ bool asserCorrectHandlers(const FlushEngine::FlushMetaSet & current1, const std::vector<const char *> & targets) { bool retval(targets.size() == current1.size()); - FlushEngine::FlushMetaSet::const_iterator curr(current1.begin()); + auto curr = current1.begin(); if (retval) { for (const char * target : targets) { if (target != (curr++)->getName()) { diff --git a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp index caedd363481..4a223967a89 100644 --- a/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp +++ b/searchcore/src/tests/proton/proton_config_fetcher/proton_config_fetcher_test.cpp @@ -123,8 +123,7 @@ struct ConfigTestFixture { void removeDocType(const std::string & name) { - for (DocumenttypesConfigBuilder::DocumenttypeVector::iterator it(documenttypesBuilder.documenttype.begin()), - mt(documenttypesBuilder.documenttype.end()); + for (auto it(documenttypesBuilder.documenttype.begin()), mt(documenttypesBuilder.documenttype.end()); it != mt; it++) { if ((*it).name.compare(name) == 0) { @@ -133,8 +132,7 @@ struct ConfigTestFixture { } } - for (ProtonConfigBuilder::DocumentdbVector::iterator it(protonBuilder.documentdb.begin()), - mt(protonBuilder.documentdb.end()); + for (auto it(protonBuilder.documentdb.begin()), mt(protonBuilder.documentdb.end()); it != mt; it++) { if ((*it).inputdoctypename.compare(name) == 0) { |