Use emplace_back

3 files changed, 12 insertions, 14 deletions

diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
index 3a36830da34..728040da50e 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp
@@ -4,15 +4,14 @@
 #include "statecheckers.h"
 #include "top_level_distributor.h"
 #include "idealstatemetricsset.h"
+#include "distributor_bucket_space_repo.h"
+#include "distributor_bucket_space.h"
 #include <vespa/vespalib/stllike/asciistream.h>
-#include <vespa/storage/storageserver/storagemetricsset.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storage/common/bucketmessages.h>
 #include <vespa/document/bucket/fixed_bucket_spaces.h>
 #include <vespa/vespalib/util/assert.h>
 #include <vespa/vespalib/stllike/hash_map.hpp>
-#include "distributor_bucket_space_repo.h"
-#include "distributor_bucket_space.h"
 
 #include <vespa/log/log.h>
 LOG_SETUP(".distributor.operation.queue");
@@ -33,22 +32,22 @@ IdealStateManager::IdealStateManager(
       _has_logged_phantom_replica_warning(false)
 {
     LOG(debug, "Adding BucketStateStateChecker to state checkers");
-    _stateCheckers.push_back(std::make_shared<BucketStateStateChecker>());
+    _stateCheckers.emplace_back(std::make_shared<BucketStateStateChecker>());
 
-    _stateCheckers.push_back(std::make_shared<SplitBucketStateChecker>());
+    _stateCheckers.emplace_back(std::make_shared<SplitBucketStateChecker>());
     _splitBucketStateChecker = dynamic_cast<SplitBucketStateChecker *>(_stateCheckers.back().get());
-    _stateCheckers.push_back(std::make_shared<SplitInconsistentStateChecker>());
-    _stateCheckers.push_back(std::make_shared<SynchronizeAndMoveStateChecker>());
-    _stateCheckers.push_back(std::make_shared<JoinBucketsStateChecker>());
-    _stateCheckers.push_back(std::make_shared<DeleteExtraCopiesStateChecker>());
-    _stateCheckers.push_back(std::make_shared<GarbageCollectionStateChecker>());
+
+    _stateCheckers.emplace_back(std::make_shared<SplitInconsistentStateChecker>());
+    _stateCheckers.emplace_back(std::make_shared<SynchronizeAndMoveStateChecker>());
+    _stateCheckers.emplace_back(std::make_shared<JoinBucketsStateChecker>());
+    _stateCheckers.emplace_back(std::make_shared<DeleteExtraCopiesStateChecker>());
+    _stateCheckers.emplace_back(std::make_shared<GarbageCollectionStateChecker>());
 }
 
 IdealStateManager::~IdealStateManager() = default;
 
 void
-IdealStateManager::print(std::ostream& out, bool verbose,
-                         const std::string& indent)
+IdealStateManager::print(std::ostream& out, bool verbose, const std::string& indent)
 {
     (void) verbose; (void) indent;
     out << "IdealStateManager";
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.h b/storage/src/vespa/storage/distributor/idealstatemanager.h
index 53247673292..32349541de2 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.h
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.h
@@ -5,7 +5,6 @@
 #include "statechecker.h"
 #include <vespa/storage/distributor/maintenance/maintenanceprioritygenerator.h>
 #include <vespa/storage/distributor/maintenance/maintenanceoperationgenerator.h>
-#include <vespa/storageframework/generic/status/htmlstatusreporter.h>
 
 namespace storage::distributor {
 
diff --git a/storage/src/vespa/storage/distributor/statechecker.h b/storage/src/vespa/storage/distributor/statechecker.h
index 016b0d015cb..11c83fdde07 100644
--- a/storage/src/vespa/storage/distributor/statechecker.h
+++ b/storage/src/vespa/storage/distributor/statechecker.h
@@ -137,7 +137,7 @@ public:
         {}
     };
 
-    StateChecker() = default;
+    StateChecker() noexcept = default;
     virtual ~StateChecker() = default;
 
     /**