Hide BucketId::List

3 files changed, 6 insertions, 8 deletions

diff --git a/vdslib/src/vespa/vdslib/container/visitorordering.h b/vdslib/src/vespa/vdslib/container/visitorordering.h
index 3d31a6ac078..e5a61d6332d 100644
--- a/vdslib/src/vespa/vdslib/container/visitorordering.h
+++ b/vdslib/src/vespa/vdslib/container/visitorordering.h
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/fastos/types.h>
 #include <string>
+#include <cstdint>
 
 namespace vdslib {
 
diff --git a/vdslib/src/vespa/vdslib/distribution/group.cpp b/vdslib/src/vespa/vdslib/distribution/group.cpp
index 8ad3dcb2f80..2fce519298f 100644
--- a/vdslib/src/vespa/vdslib/distribution/group.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/group.cpp
@@ -6,9 +6,9 @@
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <ostream>
+#include <cassert>
 
-namespace storage {
-namespace lib {
+namespace storage::lib {
 
 Group::Group(uint16_t index, vespalib::stringref name)
     : _name(name),
@@ -204,4 +204,3 @@ Group::getDistributionConfigHash() const {
 }
 
 }
-}
diff --git a/vdslib/src/vespa/vdslib/distribution/idealnodecalculatorimpl.cpp b/vdslib/src/vespa/vdslib/distribution/idealnodecalculatorimpl.cpp
index ca7ab742278..0ab4bc6b21a 100644
--- a/vdslib/src/vespa/vdslib/distribution/idealnodecalculatorimpl.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/idealnodecalculatorimpl.cpp
@@ -3,9 +3,9 @@
 #include "idealnodecalculatorimpl.h"
 #include <vespa/vespalib/util/exceptions.h>
 #include <ostream>
+#include <cassert>
 
-namespace storage {
-namespace lib {
+namespace storage::lib {
 
 IdealNodeList::IdealNodeList() :
     _idealNodes()
@@ -71,5 +71,4 @@ IdealNodeCalculatorImpl::initUpStateMapping() {
     }
 }
 
-} // lib
-} // storage
+}