From 83719759fde9ee7c938bd449f21dd58771225b05 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 2 May 2017 14:42:00 +0200 Subject: Fix warnings hidden earlier due to including application headers as system includes --- staging_vespalib/src/vespa/vespalib/net/CMakeLists.txt | 1 + .../src/vespa/vespalib/net/component_config_producer.h | 2 +- staging_vespalib/src/vespa/vespalib/net/state_server.cpp | 2 ++ staging_vespalib/src/vespa/vespalib/net/state_server.h | 7 ++----- staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp | 2 ++ staging_vespalib/src/vespa/vespalib/util/jsonstream.h | 8 +++++--- staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp | 2 ++ staging_vespalib/src/vespa/vespalib/util/jsonwriter.h | 7 +++++++ 8 files changed, 22 insertions(+), 9 deletions(-) (limited to 'staging_vespalib') diff --git a/staging_vespalib/src/vespa/vespalib/net/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/net/CMakeLists.txt index f576a391b35..86346979d63 100644 --- a/staging_vespalib/src/vespa/vespalib/net/CMakeLists.txt +++ b/staging_vespalib/src/vespa/vespalib/net/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(staging_vespalib_vespalib_net OBJECT SOURCES + component_config_producer.cpp generic_state_handler.cpp http_server.cpp json_handler_repo.cpp diff --git a/staging_vespalib/src/vespa/vespalib/net/component_config_producer.h b/staging_vespalib/src/vespa/vespalib/net/component_config_producer.h index 19f13f4c470..f027bde8519 100644 --- a/staging_vespalib/src/vespa/vespalib/net/component_config_producer.h +++ b/staging_vespalib/src/vespa/vespalib/net/component_config_producer.h @@ -14,6 +14,7 @@ struct ComponentConfigProducer { Config(const vespalib::string &n, size_t g) : name(n), gen(g), msg() {} Config(const vespalib::string &n, size_t g, const vespalib::string &m) : name(n), gen(g), msg(m) {} + ~Config(); }; struct Consumer { virtual void add(const Config &config) = 0; @@ -24,4 +25,3 @@ struct ComponentConfigProducer { }; } // namespace vespalib - diff --git a/staging_vespalib/src/vespa/vespalib/net/state_server.cpp b/staging_vespalib/src/vespa/vespalib/net/state_server.cpp index 6e81a73840f..44a076b64ac 100644 --- a/staging_vespalib/src/vespa/vespalib/net/state_server.cpp +++ b/staging_vespalib/src/vespa/vespalib/net/state_server.cpp @@ -17,4 +17,6 @@ StateServer::StateServer(int port, _server.start(); } +StateServer::~StateServer() {} + } // namespace vespalib diff --git a/staging_vespalib/src/vespa/vespalib/net/state_server.h b/staging_vespalib/src/vespa/vespalib/net/state_server.h index 63ee899fd84..ff31f0e1ed6 100644 --- a/staging_vespalib/src/vespa/vespalib/net/state_server.h +++ b/staging_vespalib/src/vespa/vespalib/net/state_server.h @@ -8,7 +8,6 @@ #include "health_producer.h" #include "metrics_producer.h" #include "component_config_producer.h" -#include #include "json_handler_repo.h" namespace vespalib { @@ -26,10 +25,8 @@ private: public: typedef std::unique_ptr UP; - StateServer(int port, - const HealthProducer &hp, - MetricsProducer &mp, - ComponentConfigProducer &ccp); + StateServer(int port, const HealthProducer &hp, MetricsProducer &mp, ComponentConfigProducer &ccp); + ~StateServer(); int getListenPort() { return _server.port(); } JsonHandlerRepo &repo() { return _api.repo(); } }; diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp b/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp index df5921ed48b..e8f242879d8 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/jsonstream.cpp @@ -25,6 +25,8 @@ JsonStream::JsonStream(vespalib::asciistream& as, bool createIndents) push({State::ROOT}); } +JsonStream::~JsonStream() {} + JsonStream& JsonStream::operator<<(vespalib::stringref value) { diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonstream.h b/staging_vespalib/src/vespa/vespalib/util/jsonstream.h index c30ec8e08f2..7f480f325cf 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonstream.h +++ b/staging_vespalib/src/vespa/vespalib/util/jsonstream.h @@ -53,15 +53,17 @@ class JsonStream : public JsonStreamTypes { }; std::vector _state; - JsonStream(const JsonStream&) = delete; - JsonStream& operator=(const JsonStream&) = delete; - StateEntry & top() { return _state.back(); } const StateEntry & top() const { return _state.back(); } void pop() { _state.resize(_state.size() - 1); } void push(const StateEntry & e) { _state.push_back(e); } public: JsonStream(asciistream&, bool createIndents = false); + JsonStream(const JsonStream&) = delete; + JsonStream& operator=(const JsonStream&) = delete; + JsonStream(JsonStream &&) = default; + JsonStream& operator=(JsonStream &&) = default; + ~JsonStream(); JsonStream& operator<<(stringref); JsonStream& operator<<(bool); diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp index 204e5119397..173f08773c5 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp +++ b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.cpp @@ -86,6 +86,8 @@ JSONWriter::JSONWriter(vespalib::asciistream & output) : (*_os) << vespalib::asciistream::Precision(16) << vespalib::forcedot; } +JSONWriter::~JSONWriter() {} + JSONWriter& JSONWriter::setOutputStream(vespalib::asciistream & output) { _os = &output; diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h index 60a7a62814b..7bfd3e2e6bb 100644 --- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h +++ b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h @@ -36,6 +36,11 @@ private: public: JSONWriter(); JSONWriter(asciistream & output); + JSONWriter(const JSONWriter &) = delete; + JSONWriter & operator = (const JSONWriter &) = delete; + JSONWriter(JSONWriter &&) = default; + JSONWriter & operator = (JSONWriter &&) = default; + ~JSONWriter(); JSONWriter & setOutputStream(asciistream & output); JSONWriter & clear(); @@ -62,6 +67,8 @@ private: public: JSONStringer(); + JSONStringer(JSONStringer &&) = default; + JSONStringer & operator = (JSONStringer &&) = default; ~JSONStringer(); JSONStringer & clear(); stringref toString() const; -- cgit v1.2.3