diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-29 13:01:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-29 13:01:37 +0100 |
commit | 91d0b8518a1b9bbff2675d4ff1541e7d35583f9b (patch) | |
tree | ca59a2a9405b75a6cde056887f241a8b9347c8e6 /persistence/src | |
parent | ded136ba6f1ac0cbe5a91600a24b70f3ff4e9cc6 (diff) | |
parent | f62d3547d3b0d1f13dcd1e805f3c965d6678b997 (diff) |
Merge pull request #4526 from vespa-engine/balder/use-faster-iteration
Balder/use faster iteration
Diffstat (limited to 'persistence/src')
-rw-r--r-- | persistence/src/vespa/persistence/conformancetest/conformancetest.cpp | 1 | ||||
-rw-r--r-- | persistence/src/vespa/persistence/spi/context.h | 8 |
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 - +} |