summaryrefslogtreecommitdiffstats
path: root/vdslib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-08-12 22:34:23 +0200
committerHenning Baldersheim <balder@oath.com>2018-08-12 22:34:23 +0200
commitfded37d945ca2539c96621b9ae33806ebbadf875 (patch)
tree2d66b6dadb6fc937471707038455a94ec50bfed0 /vdslib
parent21c4a91b55b57aad88fd95a0c9dbeedaa03600da (diff)
Remove whitespace
Diffstat (limited to 'vdslib')
-rw-r--r--vdslib/src/vespa/vdslib/container/parameters.cpp2
-rw-r--r--vdslib/src/vespa/vdslib/container/parameters.h2
-rw-r--r--vdslib/src/vespa/vdslib/state/clusterstate.h2
-rw-r--r--vdslib/src/vespa/vdslib/state/diskstate.cpp2
-rw-r--r--vdslib/src/vespa/vdslib/state/diskstate.h4
-rw-r--r--vdslib/src/vespa/vdslib/state/nodestate.cpp2
-rw-r--r--vdslib/src/vespa/vdslib/state/nodestate.h4
-rw-r--r--vdslib/src/vespa/vdslib/state/nodetype.cpp4
-rw-r--r--vdslib/src/vespa/vdslib/state/nodetype.h4
-rw-r--r--vdslib/src/vespa/vdslib/state/state.cpp4
-rw-r--r--vdslib/src/vespa/vdslib/state/state.h4
11 files changed, 17 insertions, 17 deletions
diff --git a/vdslib/src/vespa/vdslib/container/parameters.cpp b/vdslib/src/vespa/vdslib/container/parameters.cpp
index 6747bee2bec..0803c346b0a 100644
--- a/vdslib/src/vespa/vdslib/container/parameters.cpp
+++ b/vdslib/src/vespa/vdslib/container/parameters.cpp
@@ -111,7 +111,7 @@ Parameters* Parameters::clone() const
return new Parameters(*this);
}
-vespalib::stringref Parameters::get(vespalib::stringref id, vespalib::stringref def) const
+vespalib::stringref Parameters::get(vespalib::stringref id, vespalib::stringref def) const
{
ParametersMap::const_iterator it = _parameters.find(id);
if (it == _parameters.end()) return def;
diff --git a/vdslib/src/vespa/vdslib/container/parameters.h b/vdslib/src/vespa/vdslib/container/parameters.h
index 02d54643e18..f3ea0543546 100644
--- a/vdslib/src/vespa/vdslib/container/parameters.h
+++ b/vdslib/src/vespa/vdslib/container/parameters.h
@@ -32,7 +32,7 @@ public:
{
public:
Value() { }
- Value(vespalib::stringref s) : vespalib::string(s) { }
+ Value(vespalib::stringref s) : vespalib::string(s) { }
Value(const vespalib::string & s) : vespalib::string(s) { }
Value(const void *v, size_t sz) : vespalib::string(v, sz) { }
size_t length() const { return size() - 1; }
diff --git a/vdslib/src/vespa/vdslib/state/clusterstate.h b/vdslib/src/vespa/vdslib/state/clusterstate.h
index 35259ba672b..1a8e5297b65 100644
--- a/vdslib/src/vespa/vdslib/state/clusterstate.h
+++ b/vdslib/src/vespa/vdslib/state/clusterstate.h
@@ -62,7 +62,7 @@ public:
void setVersion(uint32_t version) { _version = version; }
void setClusterState(const State& state);
void setNodeState(const Node& node, const NodeState& state);
- void setDescription(vespalib::stringref s) { _description = s; }
+ void setDescription(vespalib::stringref s) { _description = s; }
void setDistributionBitCount(uint16_t count) { _distributionBits = count; }
void print(std::ostream& out, bool verbose, const std::string& indent) const override;
diff --git a/vdslib/src/vespa/vdslib/state/diskstate.cpp b/vdslib/src/vespa/vdslib/state/diskstate.cpp
index 0f41bada230..0147b422a8e 100644
--- a/vdslib/src/vespa/vdslib/state/diskstate.cpp
+++ b/vdslib/src/vespa/vdslib/state/diskstate.cpp
@@ -30,7 +30,7 @@ DiskState::DiskState(const State& state, vespalib::stringref description,
setCapacity(capacity);
}
-DiskState::DiskState(vespalib::stringref serialized)
+DiskState::DiskState(vespalib::stringref serialized)
: _state(&State::UP),
_description(""),
_capacity(1.0)
diff --git a/vdslib/src/vespa/vdslib/state/diskstate.h b/vdslib/src/vespa/vdslib/state/diskstate.h
index 7c50ea9dacc..cb28e24daac 100644
--- a/vdslib/src/vespa/vdslib/state/diskstate.h
+++ b/vdslib/src/vespa/vdslib/state/diskstate.h
@@ -23,7 +23,7 @@ public:
DiskState();
DiskState(const State&, vespalib::stringref description = "", double capacity = 1.0);
- explicit DiskState(vespalib::stringref serialized);
+ explicit DiskState(vespalib::stringref serialized);
void serialize(vespalib::asciistream & out, vespalib::stringref prefix = "",
bool includeReason = true, bool useOldFormat = false) const;
@@ -34,7 +34,7 @@ public:
void setState(const State& state);
void setCapacity(double capacity);
- void setDescription(vespalib::stringref desc) { _description = desc; }
+ void setDescription(vespalib::stringref desc) { _description = desc; }
void print(std::ostream& out, bool verbose, const std::string& indent) const override;
bool operator==(const DiskState& other) const;
diff --git a/vdslib/src/vespa/vdslib/state/nodestate.cpp b/vdslib/src/vespa/vdslib/state/nodestate.cpp
index 3ca92d6730d..22854b7a571 100644
--- a/vdslib/src/vespa/vdslib/state/nodestate.cpp
+++ b/vdslib/src/vespa/vdslib/state/nodestate.cpp
@@ -78,7 +78,7 @@ namespace {
};
}
-NodeState::NodeState(vespalib::stringref serialized, const NodeType* type)
+NodeState::NodeState(vespalib::stringref serialized, const NodeType* type)
: _type(type),
_state(&State::UP),
_description(),
diff --git a/vdslib/src/vespa/vdslib/state/nodestate.h b/vdslib/src/vespa/vdslib/state/nodestate.h
index 75cf5044acc..74f58663650 100644
--- a/vdslib/src/vespa/vdslib/state/nodestate.h
+++ b/vdslib/src/vespa/vdslib/state/nodestate.h
@@ -46,7 +46,7 @@ public:
vespalib::stringref description = "",
double capacity = 1.0, uint16_t reliability = 1);
/** Set type if you want to verify that content fit with the given type. */
- NodeState(vespalib::stringref serialized, const NodeType* nodeType = 0);
+ NodeState(vespalib::stringref serialized, const NodeType* nodeType = 0);
~NodeState();
/**
@@ -77,7 +77,7 @@ public:
void setReliability(uint16_t reliability);
void setInitProgress(vespalib::Double initProgress);
void setStartTimestamp(uint64_t startTimestamp);
- void setDescription(vespalib::stringref desc) { _description = desc; }
+ void setDescription(vespalib::stringref desc) { _description = desc; }
void setDiskCount(uint16_t count);
void setDiskState(uint16_t index, const DiskState&);
diff --git a/vdslib/src/vespa/vdslib/state/nodetype.cpp b/vdslib/src/vespa/vdslib/state/nodetype.cpp
index b5664bf691b..915b1548f88 100644
--- a/vdslib/src/vespa/vdslib/state/nodetype.cpp
+++ b/vdslib/src/vespa/vdslib/state/nodetype.cpp
@@ -14,7 +14,7 @@ const NodeType NodeType::STORAGE("storage", 0);
const NodeType NodeType::DISTRIBUTOR("distributor", 1);
const NodeType&
-NodeType::get(vespalib::stringref serialized)
+NodeType::get(vespalib::stringref serialized)
{
if (serialized == STORAGE._name) {
return STORAGE;
@@ -26,7 +26,7 @@ NodeType::get(vespalib::stringref serialized)
"Unknown node type " + serialized + " given.", VESPA_STRLOC);
}
-NodeType::NodeType(vespalib::stringref name, uint16_t enumValue)
+NodeType::NodeType(vespalib::stringref name, uint16_t enumValue)
: _enumValue(enumValue), _name(name)
{
}
diff --git a/vdslib/src/vespa/vdslib/state/nodetype.h b/vdslib/src/vespa/vdslib/state/nodetype.h
index 4adf3e0d761..35edd83fdac 100644
--- a/vdslib/src/vespa/vdslib/state/nodetype.h
+++ b/vdslib/src/vespa/vdslib/state/nodetype.h
@@ -24,14 +24,14 @@ class NodeType {
uint16_t _enumValue;
vespalib::string _name;
- NodeType(vespalib::stringref name, uint16_t enumValue);
+ NodeType(vespalib::stringref name, uint16_t enumValue);
public:
static const NodeType DISTRIBUTOR;
static const NodeType STORAGE;
/** Throws vespalib::IllegalArgumentException if invalid state given. */
- static const NodeType& get(vespalib::stringref serialized);
+ static const NodeType& get(vespalib::stringref serialized);
const vespalib::string& serialize() const { return _name; }
operator uint16_t() const { return _enumValue; }
diff --git a/vdslib/src/vespa/vdslib/state/state.cpp b/vdslib/src/vespa/vdslib/state/state.cpp
index 041753beb82..5bf95b5530b 100644
--- a/vdslib/src/vespa/vdslib/state/state.cpp
+++ b/vdslib/src/vespa/vdslib/state/state.cpp
@@ -23,7 +23,7 @@ const State State::UP("Up", "u", 6,
true, true, true, true, true, true);
const State&
-State::get(vespalib::stringref serialized)
+State::get(vespalib::stringref serialized)
{
if (serialized.size() == 1) switch(serialized[0]) {
case '-': return UNKNOWN;
@@ -39,7 +39,7 @@ State::get(vespalib::stringref serialized)
"Unknown state " + serialized + " given.", VESPA_STRLOC);
}
-State::State(vespalib::stringref name, vespalib::stringref serialized,
+State::State(vespalib::stringref name, vespalib::stringref serialized,
uint8_t rank, bool validDisk,
bool validDistributorReported, bool validStorageReported,
bool validDistributorWanted, bool validStorageWanted,
diff --git a/vdslib/src/vespa/vdslib/state/state.h b/vdslib/src/vespa/vdslib/state/state.h
index eb1c9841053..bec500a082d 100644
--- a/vdslib/src/vespa/vdslib/state/state.h
+++ b/vdslib/src/vespa/vdslib/state/state.h
@@ -26,7 +26,7 @@ class State : public vespalib::Printable {
bool _validClusterState;
State(const State&);
- State(vespalib::stringref name, vespalib::stringref serialized,
+ State(vespalib::stringref name, vespalib::stringref serialized,
uint8_t rank, bool validDisk,
bool validDistributorReported, bool validStorageReported,
bool validDistributorWanted, bool validStorageWanted,
@@ -45,7 +45,7 @@ public:
static const State UP;
/** Throws vespalib::IllegalArgumentException if invalid state given. */
- static const State& get(vespalib::stringref serialized);
+ static const State& get(vespalib::stringref serialized);
const vespalib::string& serialize() const { return _serialized; }
bool validDiskState() const { return _validDiskState; }