diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-02 14:42:04 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-02 14:42:04 +0200 |
commit | 92c158699b16d84855e7a05de8a0173abca0bebc (patch) | |
tree | 2029071d9f73ad6d624309e89485a10fb6348f5b /vespaclient | |
parent | 0f646f10b377b90fc37e9911f9fe383d112ff157 (diff) |
Fix warnings hidden earlier due to including application headers as system includes
Diffstat (limited to 'vespaclient')
-rw-r--r-- | vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.cpp | 14 | ||||
-rw-r--r-- | vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.h | 15 |
2 files changed, 22 insertions, 7 deletions
diff --git a/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.cpp b/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.cpp index b6367281be9..7565ac95451 100644 --- a/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.cpp +++ b/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.cpp @@ -1,6 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/vespaclient/clusterlist/clusterlist.h> +#include "clusterlist.h" #include <vespa/config/config.h> #include <vespa/config/helper/configgetter.hpp> #include <sstream> @@ -9,11 +9,23 @@ using namespace vespaclient; VESPA_IMPLEMENT_EXCEPTION(VCClusterNotFoundException, vespalib::IllegalArgumentException); + +ClusterList::Cluster::Cluster(const std::string& name, const std::string& configId) + : _name(name), + _configId(configId) +{} + +ClusterList::Cluster::Cluster(const Cluster &) = default; +ClusterList::Cluster & ClusterList::Cluster::operator = (const Cluster &) = default; +ClusterList::Cluster::~Cluster() {} + ClusterList::ClusterList() { configure(*config::ConfigGetter<cloud::config::ClusterListConfig>::getConfig("client")); } +ClusterList::~ClusterList() {} + void ClusterList::configure(const cloud::config::ClusterListConfig& config) { diff --git a/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.h b/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.h index 7469194233e..98596ea2524 100644 --- a/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.h +++ b/vespaclient/src/vespa/vespaclient/clusterlist/clusterlist.h @@ -15,12 +15,15 @@ VESPA_DEFINE_EXCEPTION(VCClusterNotFoundException, vespalib::IllegalArgumentExce class ClusterList { public: - typedef VCClusterNotFoundException ClusterNotFoundException; + using ClusterNotFoundException = VCClusterNotFoundException; class Cluster { public: - Cluster(const std::string& name, const std::string& configId) - : _name(name), - _configId(configId) {}; + Cluster(const std::string& name, const std::string& configId); + Cluster(const Cluster &); + Cluster & operator = (const Cluster &); + Cluster(Cluster &) = default; + Cluster & operator = (Cluster &&) = default; + ~Cluster(); const std::string& getName() const { return _name; } const std::string& getConfigId() const { return _configId; } @@ -30,6 +33,7 @@ public: }; ClusterList(); + ~ClusterList(); const std::vector<Cluster>& getContentClusters() const { return _contentClusters; } @@ -42,10 +46,9 @@ public: private: void configure(const cloud::config::ClusterListConfig& cfg); + std::string getContentClusterList() const; std::vector<Cluster> _contentClusters; - - std::string getContentClusterList() const; }; } |