diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-01 12:46:26 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-12 02:55:41 +0100 |
commit | 9fd8645ac67e0538cb5cf95fe46d8701f3c8535c (patch) | |
tree | 7770bbea25a9c10451a4ab5e0e004591d29452c7 /vdslib | |
parent | 24cb878af1ec770f075f6ccfd582dcceb146cb14 (diff) |
Do not include asciistream everywhere.
Diffstat (limited to 'vdslib')
-rw-r--r-- | vdslib/src/vespa/vdslib/distribution/group.cpp | 11 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/distribution/group.h | 7 | ||||
-rw-r--r-- | vdslib/src/vespa/vdslib/state/nodetype.h | 7 |
3 files changed, 20 insertions, 5 deletions
diff --git a/vdslib/src/vespa/vdslib/distribution/group.cpp b/vdslib/src/vespa/vdslib/distribution/group.cpp index 0ffe937a949..695b68bf7f9 100644 --- a/vdslib/src/vespa/vdslib/distribution/group.cpp +++ b/vdslib/src/vespa/vdslib/distribution/group.cpp @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/vdslib/distribution/group.h> +#include "group.h" #include <vespa/vdslib/state/random.h> #include <vespa/vespalib/util/exceptions.h> #include <algorithm> +#include <vespa/util/stllike/asciistream.h> namespace storage { namespace lib { @@ -195,5 +195,12 @@ Group::getConfigHash(vespalib::asciistream& out) const out << ')'; } +vespalib::string +Group::getDistributionConfigHash() const { + vespalib::asciistream ost; + getConfigHash(ost); + return ost.str(); + + } // lib } // storage diff --git a/vdslib/src/vespa/vdslib/distribution/group.h b/vdslib/src/vespa/vdslib/distribution/group.h index d4952941dbd..a18e4e9a5d7 100644 --- a/vdslib/src/vespa/vdslib/distribution/group.h +++ b/vdslib/src/vespa/vdslib/distribution/group.h @@ -17,7 +17,12 @@ #include <vespa/config-stor-distribution.h> #include <vespa/vdslib/distribution/redundancygroupdistribution.h> #include <vespa/vespalib/util/crc.h> -#include <vespa/vespalib/stllike/asciistream.h> + +namespace vespalib { + +class asciistream; + +} namespace storage { namespace lib { diff --git a/vdslib/src/vespa/vdslib/state/nodetype.h b/vdslib/src/vespa/vdslib/state/nodetype.h index 8bb96f47743..c594dc57aec 100644 --- a/vdslib/src/vespa/vdslib/state/nodetype.h +++ b/vdslib/src/vespa/vdslib/state/nodetype.h @@ -9,9 +9,12 @@ */ #pragma once -#include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/vespalib/stllike/string.h> #include <stdint.h> -#include <ostream> + +namespace vespalib { + class asciistream; +} namespace storage { namespace lib { |