From a0a8cc121663a7d3dbebd426ae2e5953df45c66f Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sun, 17 Jul 2022 16:58:51 +0000
Subject: GC typedef not needed anymore.

---
 searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.cpp | 4 ++--
 searchcore/src/vespa/searchcore/proton/bucketdb/bucketdb.h   | 2 --
 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;
-- 
cgit v1.2.3