[icinga-checkins] icinga.org: icinga2/master: Fix compiler warnings in DB IDO

git at icinga.org git at icinga.org
Thu Aug 25 07:10:54 CEST 2016


Module: icinga2
Branch: master
Commit: 78c249b96bc0e7bf5137c74fe7217a77a2b5563d
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=78c249b96bc0e7bf5137c74fe7217a77a2b5563d

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Thu Aug 25 05:00:46 2016 +0200

Fix compiler warnings in DB IDO

refs #12534

---

 lib/db_ido/hostdbobject.hpp             |    2 +-
 lib/db_ido/servicedbobject.hpp          |    2 +-
 lib/db_ido/userdbobject.hpp             |    2 +-
 lib/db_ido_mysql/idomysqlconnection.hpp |    2 +-
 lib/db_ido_pgsql/idopgsqlconnection.hpp |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/db_ido/hostdbobject.hpp b/lib/db_ido/hostdbobject.hpp
index 679bea6..35fb9d8 100644
--- a/lib/db_ido/hostdbobject.hpp
+++ b/lib/db_ido/hostdbobject.hpp
@@ -44,7 +44,7 @@ public:
 	virtual void OnConfigUpdateHeavy(void) override;
 	virtual void OnConfigUpdateLight(void) override;
 
-	virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const;
+	virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override;
 
 private:
 	void DoCommonConfigUpdate(void);
diff --git a/lib/db_ido/servicedbobject.hpp b/lib/db_ido/servicedbobject.hpp
index 64ffca2..db15ac5 100644
--- a/lib/db_ido/servicedbobject.hpp
+++ b/lib/db_ido/servicedbobject.hpp
@@ -47,7 +47,7 @@ public:
 	virtual void OnConfigUpdateHeavy(void) override;
 	virtual void OnConfigUpdateLight(void) override;
 
-	virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const;
+	virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override;
 
 private:
 	void DoCommonConfigUpdate(void);
diff --git a/lib/db_ido/userdbobject.hpp b/lib/db_ido/userdbobject.hpp
index 2aa90be..9bae4c6 100644
--- a/lib/db_ido/userdbobject.hpp
+++ b/lib/db_ido/userdbobject.hpp
@@ -44,7 +44,7 @@ protected:
 
 	virtual void OnConfigUpdateHeavy(void) override;
 
-	virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const;
+	virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const override;
 };
 
 }
diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp
index 2115a9d..c134cf7 100644
--- a/lib/db_ido_mysql/idomysqlconnection.hpp
+++ b/lib/db_ido_mysql/idomysqlconnection.hpp
@@ -64,7 +64,7 @@ protected:
 	virtual void ActivateObject(const DbObject::Ptr& dbobj) override;
 	virtual void DeactivateObject(const DbObject::Ptr& dbobj) override;
 	virtual void ExecuteQuery(const DbQuery& query) override;
-	virtual void ExecuteMultipleQueries(const std::vector<DbQuery>& queries);
+	virtual void ExecuteMultipleQueries(const std::vector<DbQuery>& queries) override;
 	virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override;
 	virtual void FillIDCache(const DbType::Ptr& type) override;
 	virtual void NewTransaction(void) override;
diff --git a/lib/db_ido_pgsql/idopgsqlconnection.hpp b/lib/db_ido_pgsql/idopgsqlconnection.hpp
index 5ddb699..62fd2a9 100644
--- a/lib/db_ido_pgsql/idopgsqlconnection.hpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.hpp
@@ -56,7 +56,7 @@ protected:
 	virtual void ActivateObject(const DbObject::Ptr& dbobj) override;
 	virtual void DeactivateObject(const DbObject::Ptr& dbobj) override;
 	virtual void ExecuteQuery(const DbQuery& query) override;
-	virtual void ExecuteMultipleQueries(const std::vector<DbQuery>& queries);
+	virtual void ExecuteMultipleQueries(const std::vector<DbQuery>& queries) override;
 	virtual void CleanUpExecuteQuery(const String& table, const String& time_key, double time_value) override;
 	virtual void FillIDCache(const DbType::Ptr& type) override;
 	virtual void NewTransaction(void) override;



More information about the icinga-checkins mailing list