diff options
-rw-r--r-- | persistence/src/vespa/persistence/spi/context.h | 1 | ||||
-rw-r--r-- | persistencetypes/src/persistence/spi/types.cpp | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/persistence/src/vespa/persistence/spi/context.h b/persistence/src/vespa/persistence/spi/context.h index 4061a3ad549..8c31439ee75 100644 --- a/persistence/src/vespa/persistence/spi/context.h +++ b/persistence/src/vespa/persistence/spi/context.h @@ -29,7 +29,6 @@ #pragma once -#include <persistence/spi/types.h> #include "read_consistency.h" #include <vespa/vespalib/trace/trace.h> diff --git a/persistencetypes/src/persistence/spi/types.cpp b/persistencetypes/src/persistence/spi/types.cpp index 00aa95b9707..e746f02e869 100644 --- a/persistencetypes/src/persistence/spi/types.cpp +++ b/persistencetypes/src/persistence/spi/types.cpp @@ -1,11 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "types.h" - #include <vespa/vespalib/objects/nbostream.h> -namespace storage { - -namespace spi { +namespace storage::spi { DEFINE_PRIMITIVE_WRAPPER_NBOSTREAM(NodeIndex); DEFINE_PRIMITIVE_WRAPPER_NBOSTREAM(PartitionId); @@ -14,5 +11,3 @@ DEFINE_PRIMITIVE_WRAPPER_NBOSTREAM(Timestamp); DEFINE_PRIMITIVE_WRAPPER_NBOSTREAM(BucketChecksum); } - -} |