Merge pull request #4526 from vespa-engine/balder/use-faster-iteration

Balder/use faster iteration

2 files changed, 3 insertions, 6 deletions

diff --git a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
index 885d3e9aad7..7f4ea9dcc2e 100644
--- a/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
+++ b/persistence/src/vespa/persistence/conformancetest/conformancetest.cpp
@@ -8,6 +8,7 @@
 #include <vespa/document/update/documentupdate.h>
 #include <vespa/document/update/assignvalueupdate.h>
 #include <vespa/document/test/make_bucket_space.h>
+#include <vespa/metrics/loadmetric.h>
 #include <vespa/vdslib/state/state.h>
 #include <vespa/vdslib/state/node.h>
 #include <vespa/vdslib/state/nodestate.h>
diff --git a/persistence/src/vespa/persistence/spi/context.h b/persistence/src/vespa/persistence/spi/context.h
index 75d3eac4538..ca4c79e3005 100644
--- a/persistence/src/vespa/persistence/spi/context.h
+++ b/persistence/src/vespa/persistence/spi/context.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include <vespa/metrics/loadmetric.h>
 #include <persistence/spi/types.h>
 #include <vespa/persistence/spi/read_consistency.h>
 #include <vespa/vespalib/trace/trace.h>
@@ -38,8 +37,7 @@ namespace metrics {
     class LoadType;
 }
 
-namespace storage {
-namespace spi {
+namespace storage::spi {
 
 using LoadType = metrics::LoadType;
 
@@ -93,6 +91,4 @@ public:
         { _trace.trace(level, msg, addTime); }
 };
 
-} // spi
-} // storage
-
+}