diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-06 20:47:39 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:50:24 +0200 |
commit | 0b37a1b9eecf9b38310bde4a11c01a7962234450 (patch) | |
tree | 1f6b1836d69fe2e72d800397167f5b5ff02ed90a /vdslib | |
parent | a9ba7645226f200148de44a19aff204dd0841493 (diff) |
Hide BucketId::List
Diffstat (limited to 'vdslib')
-rw-r--r-- | vdslib/src/vespa/vdslib/container/visitorordering.h | 2 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/distribution/group.cpp | 5 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/distribution/idealnodecalculatorimpl.cpp | 7 |
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 +} |