summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-07-17 16:58:51 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-07-17 16:58:51 +0000
commita0a8cc121663a7d3dbebd426ae2e5953df45c66f (patch)
treeda2f0caca7684322740595f1cc6ecf1b068e977c
parent2ced22a372c4a523f6b29e13d6c36cf73a2bc9b5 (diff)
GC typedef not needed anymore.
-rw-r--r--searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp4
-rw-r--r--searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
index 37d04f6bcb9..237fd59f78d 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp
@@ -261,8 +261,8 @@ BucketDB::populateActiveBuckets(BucketId::List buckets)
BucketState activeState;
activeState.setActive(true);
for (const BucketId & bucketId : toAdd) {
- InsertResult ins(_map.emplace(bucketId, activeState));
- assert(ins.second);
+ auto [itr, inserted] = _map.emplace(bucketId, activeState);
+ assert(inserted);
}
return fixupBuckets;
}
diff --git a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
index 6fe46d97f46..99f31712234 100644
--- a/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
+++ b/searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h
@@ -20,9 +20,7 @@ public:
typedef storage::spi::BucketChecksum BucketChecksum;
typedef bucketdb::BucketState BucketState;
typedef std::map<BucketId, BucketState> Map;
- typedef Map::iterator MapIterator;
typedef Map::const_iterator ConstMapIterator;
- typedef std::pair<MapIterator, bool> InsertResult;
private:
Map _map;