diff options
6 files changed, 42 insertions, 13 deletions
diff --git a/configutil/src/apps/configstatus/main.cpp b/configutil/src/apps/configstatus/main.cpp index db411d309d1..1376624b207 100644 --- a/configutil/src/apps/configstatus/main.cpp +++ b/configutil/src/apps/configstatus/main.cpp @@ -20,9 +20,17 @@ public: void usage(void); int Main(void); - Application() : _flags(), _cfgId("admin/model"), _specString("") {} + Application(); + ~Application(); }; +Application::Application() + : _flags(), + _cfgId("admin/model"), + _specString("") +{} +Application::~Application() { } + int Application::parseOpts() { char c = '?'; const char *optArg = NULL; diff --git a/configutil/src/apps/modelinspect/main.cpp b/configutil/src/apps/modelinspect/main.cpp index ca660791223..9b5c2ccdd09 100644 --- a/configutil/src/apps/modelinspect/main.cpp +++ b/configutil/src/apps/modelinspect/main.cpp @@ -18,12 +18,16 @@ class Application : public FastOS_Application int parseOpts(); vespalib::string getSources(); public: - void usage(void); - int Main(void); + void usage(); + int Main(); - Application() : _flags(), _cfgId("admin/model"), _specString("") {} + Application(); + ~Application(); }; +Application::Application() : _flags(), _cfgId("admin/model"), _specString("") {} +Application::~Application() { } + int Application::parseOpts() { diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp index bd3b9cb43ea..5f15b469d90 100644 --- a/configutil/src/lib/configstatus.cpp +++ b/configutil/src/lib/configstatus.cpp @@ -29,6 +29,8 @@ struct ComponentTraverser : public vespalib::slime::ObjectTraverser : _configId(configId), _state(ROOT), _generations(generations) {} + ~ComponentTraverser(); + void object(const vespalib::slime::Inspector &inspector) { inspector.traverse(*this); } @@ -70,6 +72,8 @@ struct ComponentTraverser : public vespalib::slime::ObjectTraverser } }; +ComponentTraverser::~ComponentTraverser() {} + class MyHttpHandler : public vbench::HttpResultHandler { private: std::string _json; @@ -81,6 +85,7 @@ public: MyHttpHandler(std::string configId) : _json(), _error(), _configId(configId) {} + ~MyHttpHandler(); virtual void handleHeader(const vbench::string &name, const vbench::string &value) { (void) name; @@ -105,6 +110,8 @@ public: } }; +MyHttpHandler::~MyHttpHandler() {} + ConfigStatus::ConfigStatus(Flags flags, const config::ConfigUri uri) : _cfg(), _flags(flags), _generation(0) { diff --git a/document/src/tests/fieldvalue/referencefieldvalue_test.cpp b/document/src/tests/fieldvalue/referencefieldvalue_test.cpp index 1399c71fcc3..254bd546926 100644 --- a/document/src/tests/fieldvalue/referencefieldvalue_test.cpp +++ b/document/src/tests/fieldvalue/referencefieldvalue_test.cpp @@ -19,8 +19,12 @@ struct Fixture { DocumentType otherDocType{"bar"}; ReferenceDataType otherRefType{otherDocType, 54321}; + Fixture(); + ~Fixture(); }; + Fixture::Fixture() { } + Fixture::~Fixture() { } } using vespalib::IllegalArgumentException; diff --git a/filedistribution/src/apps/filedistributor/filedistributor.cpp b/filedistribution/src/apps/filedistributor/filedistributor.cpp index c51182134a0..1d51c032e9c 100644 --- a/filedistribution/src/apps/filedistributor/filedistributor.cpp +++ b/filedistribution/src/apps/filedistributor/filedistributor.cpp @@ -137,14 +137,8 @@ class FileDistributor : public config::IFetcherCallback<ZookeepersConfig>, public: FileDistributor(const FileDistributor &) = delete; FileDistributor & operator = (const FileDistributor &) = delete; - FileDistributor() - : _configMutex(), - _completeReconfigurationNeeded(false), - _zooKeepersConfig(), - _fileDistributorConfig(), - _rpcConfig(), - _components() - { } + FileDistributor(); + ~FileDistributor(); void notifyGenerationChange(int64_t generation) { if (_components && ! completeReconfigurationNeeded()) { @@ -232,6 +226,16 @@ public: } }; +FileDistributor::FileDistributor() + : _configMutex(), + _completeReconfigurationNeeded(false), + _zooKeepersConfig(), + _fileDistributorConfig(), + _rpcConfig(), + _components() +{ } +FileDistributor::~FileDistributor() { } + class FileDistributorApplication : public FastOS_Application { const config::ConfigUri _configUri; public: diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp index f9375fd607a..2412b00ecd6 100644 --- a/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp +++ b/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp @@ -88,7 +88,8 @@ TrackingTask::TrackingTask(Scheduler& scheduler, TrackingTask::~TrackingTask() {} - +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Winline" //TODO: refactor void TrackingTask::doHandle() { @@ -121,6 +122,7 @@ TrackingTask::doHandle() { } } } +#pragma GCC diagnostic pop PeerEntries TrackingTask::getPeers(const std::shared_ptr<FileDownloader>& downloader) { |