diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-11 11:44:15 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-11 11:44:15 +0200 |
commit | 6682a2b49797e051638f0e5620088eb997739e80 (patch) | |
tree | 138fb19ed089e52cf16735cd011548e8f3fb272d /configutil | |
parent | 221c4cbc0f0c1df1541f6f89ec41c4bd2f5457c6 (diff) |
add override in configutil module
Diffstat (limited to 'configutil')
-rw-r--r-- | configutil/src/apps/configstatus/main.cpp | 2 | ||||
-rw-r--r-- | configutil/src/apps/modelinspect/main.cpp | 2 | ||||
-rw-r--r-- | configutil/src/lib/configstatus.cpp | 8 | ||||
-rw-r--r-- | configutil/src/tests/config_status/config_status_test.cpp | 2 | ||||
-rw-r--r-- | configutil/src/tests/model_inspect/model_inspect_test.cpp | 24 |
5 files changed, 19 insertions, 19 deletions
diff --git a/configutil/src/apps/configstatus/main.cpp b/configutil/src/apps/configstatus/main.cpp index 1376624b207..f774afa355d 100644 --- a/configutil/src/apps/configstatus/main.cpp +++ b/configutil/src/apps/configstatus/main.cpp @@ -18,7 +18,7 @@ class Application : public FastOS_Application { HostFilter parse_host_set(vespalib::stringref raw_arg) const; public: void usage(void); - int Main(void); + int Main(void) override; Application(); ~Application(); diff --git a/configutil/src/apps/modelinspect/main.cpp b/configutil/src/apps/modelinspect/main.cpp index 9b5c2ccdd09..0aca2499cea 100644 --- a/configutil/src/apps/modelinspect/main.cpp +++ b/configutil/src/apps/modelinspect/main.cpp @@ -19,7 +19,7 @@ class Application : public FastOS_Application vespalib::string getSources(); public: void usage(); - int Main(); + int Main() override; Application(); ~Application(); diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp index 5f15b469d90..174350c5eca 100644 --- a/configutil/src/lib/configstatus.cpp +++ b/configutil/src/lib/configstatus.cpp @@ -42,7 +42,7 @@ struct ComponentTraverser : public vespalib::slime::ObjectTraverser } virtual void - field(const vespalib::Memory &symbol_name, const vespalib::slime::Inspector &inspector) { + field(const vespalib::Memory &symbol_name, const vespalib::slime::Inspector &inspector) override { switch (_state) { case ROOT: _component = symbol_name.make_string(); @@ -87,16 +87,16 @@ public: {} ~MyHttpHandler(); - virtual void handleHeader(const vbench::string &name, const vbench::string &value) { + virtual void handleHeader(const vbench::string &name, const vbench::string &value) override { (void) name; (void) value; } - virtual void handleContent(const vbench::Memory &data) { + virtual void handleContent(const vbench::Memory &data) override { _json += std::string(data.data, data.size); } - virtual void handleFailure(const vbench::string &reason) { + virtual void handleFailure(const vbench::string &reason) override { std::cerr << _configId << ": Failed to fetch json: " << reason << std::endl; _error = reason; } diff --git a/configutil/src/tests/config_status/config_status_test.cpp b/configutil/src/tests/config_status/config_status_test.cpp index ac672b3a367..77fcf1b8da8 100644 --- a/configutil/src/tests/config_status/config_status_test.cpp +++ b/configutil/src/tests/config_status/config_status_test.cpp @@ -18,7 +18,7 @@ private: bool _fail; virtual void onGetRequest(const string &, const string &, - Fast_HTTPConnection &conn) { + Fast_HTTPConnection &conn) override { if (_fail) { conn.Output(conn.GetHTTPVersion().c_str()); conn.Output(" 500 Error\r\n"); diff --git a/configutil/src/tests/model_inspect/model_inspect_test.cpp b/configutil/src/tests/model_inspect/model_inspect_test.cpp index 3273e07653e..be45d4d0d46 100644 --- a/configutil/src/tests/model_inspect/model_inspect_test.cpp +++ b/configutil/src/tests/model_inspect/model_inspect_test.cpp @@ -84,18 +84,18 @@ public: _getIndexOf = false; }; - void yamlDump() { _yamlDump = true; }; - void listHosts() { _listHosts = true; }; - void listServices() { _listServices = true; }; - void listClusters() { _listClusters = true; }; - void listConfigIds() { _listConfigIds = true; }; - int listHost(const vespalib::string) { _listHost = true; return 0; }; - int listAllPorts() { _listAllPorts = true; return 0; }; - int listCluster(const vespalib::string) { _listCluster = true; return 0; }; - int listService(const vespalib::string) { _listService = true; return 0; }; - int listService(const vespalib::string, const vespalib::string) { _listService2 = true; return 0; }; - int listConfigId(const vespalib::string) { _listConfigId = true; return 0; }; - int getIndexOf(const vespalib::string, const vespalib::string) { _getIndexOf = true; return 0; }; + void yamlDump() override { _yamlDump = true; }; + void listHosts() override { _listHosts = true; }; + void listServices() override { _listServices = true; }; + void listClusters() override { _listClusters = true; }; + void listConfigIds() override { _listConfigIds = true; }; + int listHost(const vespalib::string) override { _listHost = true; return 0; }; + int listAllPorts() override { _listAllPorts = true; return 0; }; + int listCluster(const vespalib::string) override { _listCluster = true; return 0; }; + int listService(const vespalib::string) override { _listService = true; return 0; }; + int listService(const vespalib::string, const vespalib::string) override { _listService2 = true; return 0; }; + int listConfigId(const vespalib::string) override { _listConfigId = true; return 0; }; + int getIndexOf(const vespalib::string, const vespalib::string) override { _getIndexOf = true; return 0; }; ~ModelDummy() {}; }; |